mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* m4/libtool.m4 (LT_AC_PROG_EGREP): Wrapper for AC_PROG_GREP.
AIX has a brain-dead grep that only handles lines < 2048 characters. Default GREP incase we are not using a future autoconf that sets it for us :-) Changed all callers to use $GREP instead of grep, and to AC_REQUIRE LT_AC_PROG_EGREP. Declare GREP as a libtool config var. * ltmain.in: Use it. * tests/sh.test (scripts): Accept `if $GREP "^foo=bar"' by tightening the regexp. Reported by Albert Chin-A-Young <china@thewrittenword.com>
This commit is contained in:
parent
5b48aab18d
commit
a9d07029d6
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
2004-01-22 Gary V. Vaughan <gary@gnu.org>
|
||||
|
||||
* m4/libtool.m4 (LT_AC_PROG_EGREP): Wrapper for AC_PROG_GREP.
|
||||
AIX has a brain-dead grep that only handles lines < 2048
|
||||
characters. Default GREP incase we are not using a future
|
||||
autoconf that sets it for us :-) Changed all callers to use $GREP
|
||||
instead of grep, and to AC_REQUIRE LT_AC_PROG_EGREP.
|
||||
Declare GREP as a libtool config var.
|
||||
* ltmain.in: Use it.
|
||||
* tests/sh.test (scripts): Accept `if $GREP "^foo=bar"' by
|
||||
tightening the regexp.
|
||||
Reported by Albert Chin-A-Young <china@thewrittenword.com>
|
||||
|
||||
2004-01-21 Nick Hudson <skrll@netbsd.org>
|
||||
|
||||
* m4/libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [netbsd*]: Remove
|
||||
|
46
ltmain.in
46
ltmain.in
@ -131,7 +131,7 @@ win32_libid () {
|
||||
;;
|
||||
*ar\ archive*) # could be an import, or static
|
||||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
||||
grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||
$EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||
win32_nmres=`eval $NM -f posix -A $1 | \
|
||||
sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
|
||||
if test "X$win32_nmres" = "Ximport" ; then
|
||||
@ -218,7 +218,7 @@ do
|
||||
# not specially marked.
|
||||
;;
|
||||
*)
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
|
||||
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
|
||||
taglist="$taglist $tagname"
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
|
||||
@ -517,7 +517,7 @@ exec_cmd=
|
||||
# if we don't check for them as well.
|
||||
*)
|
||||
for z in $available_tags; do
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case "$base_compile " in
|
||||
@ -915,7 +915,7 @@ EOF
|
||||
# if we don't check for them as well.
|
||||
*)
|
||||
for z in $available_tags; do
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
@ -1085,7 +1085,7 @@ EOF
|
||||
# A libtool-controlled object.
|
||||
|
||||
# Check to see that this really is a libtool object.
|
||||
if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '2q' $arg | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
pic_object=
|
||||
non_pic_object=
|
||||
|
||||
@ -1589,7 +1589,7 @@ EOF
|
||||
# A libtool-controlled object.
|
||||
|
||||
# Check to see that this really is a libtool object.
|
||||
if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '2q' $arg | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
pic_object=
|
||||
non_pic_object=
|
||||
|
||||
@ -1921,7 +1921,7 @@ EOF
|
||||
case " $predeps $postdeps " in
|
||||
*" $deplib "*)
|
||||
if (${SED} -e '2q' $lib |
|
||||
grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
$GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
library_names=
|
||||
old_library=
|
||||
case $lib in
|
||||
@ -2066,7 +2066,7 @@ EOF
|
||||
fi
|
||||
|
||||
# Check to see that this really is a libtool archive.
|
||||
if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
if (${SED} -e '2q' $lib | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
else
|
||||
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
@ -2431,7 +2431,7 @@ EOF
|
||||
*-*-darwin* )
|
||||
# if the lib is a module then we can not link against it, someone
|
||||
# is ignoring the new warnings I added
|
||||
if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
|
||||
if /usr/bin/file -L $add 2> /dev/null | $GREP "bundle" >/dev/null ; then
|
||||
$echo "** Warning, lib $linklib is a module, not a shared library"
|
||||
if test -z "$old_library" ; then
|
||||
$echo
|
||||
@ -2655,7 +2655,7 @@ EOF
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if grep "^installed=no" $deplib > /dev/null; then
|
||||
if $GREP "^installed=no" $deplib > /dev/null; then
|
||||
path="$absdir/$objdir"
|
||||
else
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
@ -3398,7 +3398,7 @@ EOF
|
||||
for potent_lib in $potential_libs; do
|
||||
# Follow soft links.
|
||||
if ls -lLd "$potent_lib" 2>/dev/null \
|
||||
| grep " -> " >/dev/null; then
|
||||
| $GREP " -> " >/dev/null; then
|
||||
continue
|
||||
fi
|
||||
# The statement above tries to avoid entering an
|
||||
@ -3508,7 +3508,7 @@ EOF
|
||||
done
|
||||
fi
|
||||
if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
|
||||
| grep . >/dev/null; then
|
||||
| $GREP . >/dev/null; then
|
||||
$echo
|
||||
if test "X$deplibs_check_method" = "Xnone"; then
|
||||
$echo "*** Warning: inter-library dependencies are not supported in this platform."
|
||||
@ -4356,7 +4356,7 @@ extern \"C\" {
|
||||
$run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
||||
else
|
||||
$run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
|
||||
$run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
|
||||
$run eval '$GREP -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
|
||||
$run eval 'mv "$nlist"T "$nlist"'
|
||||
fi
|
||||
fi
|
||||
@ -4378,7 +4378,7 @@ extern \"C\" {
|
||||
fi
|
||||
|
||||
# Try sorting and uniquifying the output.
|
||||
if grep -v "^: " < "$nlist" |
|
||||
if $GREP -v "^: " < "$nlist" |
|
||||
if sort -k 3 </dev/null >/dev/null 2>&1; then
|
||||
sort -k 3
|
||||
else
|
||||
@ -4387,7 +4387,7 @@ extern \"C\" {
|
||||
uniq > "$nlist"S; then
|
||||
:
|
||||
else
|
||||
grep -v "^: " < "$nlist" > "$nlist"S
|
||||
$GREP -v "^: " < "$nlist" > "$nlist"S
|
||||
fi
|
||||
|
||||
if test -f "$nlist"S; then
|
||||
@ -5468,7 +5468,7 @@ relink_command=\"$relink_command\""
|
||||
# install_prog (especially on Windows NT).
|
||||
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
|
||||
# Allow the use of GNU shtool's install command.
|
||||
$echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
|
||||
$echo "X$nonopt" | $Xsed | $GREP shtool > /dev/null; then
|
||||
# Aesthetically quote it.
|
||||
arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
|
||||
case $arg in
|
||||
@ -5620,7 +5620,7 @@ relink_command=\"$relink_command\""
|
||||
|
||||
*.la)
|
||||
# Check to see that this really is a libtool archive.
|
||||
if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
else
|
||||
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
|
||||
$echo "$help" 1>&2
|
||||
@ -5812,7 +5812,7 @@ relink_command=\"$relink_command\""
|
||||
wrapper=$file
|
||||
;;
|
||||
esac
|
||||
if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
|
||||
if (${SED} -e '4q' $wrapper | $GREP "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
|
||||
notinst_deplibs=
|
||||
relink_command=
|
||||
|
||||
@ -6062,7 +6062,7 @@ relink_command=\"$relink_command\""
|
||||
case $file in
|
||||
*.la)
|
||||
# Check to see that this really is a libtool archive.
|
||||
if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
else
|
||||
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
||||
$echo "$help" 1>&2
|
||||
@ -6133,7 +6133,7 @@ relink_command=\"$relink_command\""
|
||||
-*) ;;
|
||||
*)
|
||||
# Do a test to see if this is really a libtool program.
|
||||
if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '4q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
# If there is no directory component, then add one.
|
||||
case $file in
|
||||
*/* | *\\*) . $file ;;
|
||||
@ -6243,7 +6243,7 @@ relink_command=\"$relink_command\""
|
||||
case $name in
|
||||
*.la)
|
||||
# Possibly a libtool archive, so verify it.
|
||||
if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
. $dir/$name
|
||||
|
||||
# Delete the libtool libraries and symlinks.
|
||||
@ -6292,7 +6292,7 @@ relink_command=\"$relink_command\""
|
||||
|
||||
*.lo)
|
||||
# Possibly a libtool object, so verify it.
|
||||
if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
|
||||
# Read the .lo file
|
||||
. $dir/$name
|
||||
@ -6324,7 +6324,7 @@ relink_command=\"$relink_command\""
|
||||
;;
|
||||
esac
|
||||
# Do a test to see if this is a libtool program.
|
||||
if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '4q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
relink_command=
|
||||
. $dir/$noexename
|
||||
|
||||
|
142
m4/libtool.m4
vendored
142
m4/libtool.m4
vendored
@ -106,9 +106,6 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||
test -z "$LN_S" && LN_S="ln -s"
|
||||
_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
|
||||
|
||||
AC_REQUIRE([AC_PROG_EGREP])dnl
|
||||
_LT_DECL([], [EGREP], [1], [An ERE matcher])dnl
|
||||
|
||||
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_OLD_ARCHIVE])dnl
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_MAX_CMD_LEN])dnl
|
||||
@ -1452,10 +1449,11 @@ _LT_TAGDECL([], [hardcode_action], [0],
|
||||
# AC_LIBTOOL_SYS_LIB_STRIP
|
||||
# ------------------------
|
||||
AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
|
||||
[striplib=
|
||||
[AC_REQUIRE([LT_AC_PROG_EGREP])
|
||||
striplib=
|
||||
old_striplib=
|
||||
AC_MSG_CHECKING([whether stripping libraries is possible])
|
||||
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
|
||||
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
|
||||
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
|
||||
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -1484,7 +1482,8 @@ _LT_DECL([], [striplib], [1])
|
||||
# -----------------------------
|
||||
# PORTME Fill in your ld.so characteristics
|
||||
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
|
||||
[AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
[AC_REQUIRE([LT_AC_PROG_EGREP])
|
||||
AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
@ -1499,8 +1498,8 @@ version_type=none
|
||||
dynamic_linker="$host_os ld.so"
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
||||
if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
||||
if echo "$sys_lib_search_path_spec" | $GREP ';' >/dev/null ; then
|
||||
# if the path contains ";" then we assume it to be the separator
|
||||
# otherwise default to the standard path separator (i.e. ":") - it is
|
||||
# assumed that no part of a normal pathname contains ";" but that should
|
||||
@ -1548,7 +1547,7 @@ aix4* | aix5*)
|
||||
aix4 | aix4.[[01]] | aix4.[[01]].*)
|
||||
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
|
||||
echo ' yes '
|
||||
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
|
||||
echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
|
||||
:
|
||||
else
|
||||
can_build_shared=no
|
||||
@ -1632,8 +1631,8 @@ cygwin* | mingw* | pw32*)
|
||||
mingw*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
||||
if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
||||
if echo "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
|
||||
# It is most probably a Windows format PATH printed by
|
||||
# mingw gcc, but we are running on Cygwin. Gcc prints its search
|
||||
# path with ; separators, and with drive letters. We can handle the
|
||||
@ -1673,7 +1672,7 @@ darwin* | rhapsody*)
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | $GREP "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
else
|
||||
sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
|
||||
fi
|
||||
@ -1879,7 +1878,7 @@ netbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
dynamic_linker='NetBSD (a.out) ld.so'
|
||||
@ -1917,7 +1916,7 @@ openbsd*)
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
case $host_os in
|
||||
openbsd2.[[89]] | openbsd2.[[89]].*)
|
||||
shlibpath_overrides_runpath=no
|
||||
@ -2115,7 +2114,7 @@ m4_define([_LT_AC_TAG_CONFIG],
|
||||
AC_MSG_ERROR([output file `$ofile' does not exist])
|
||||
fi
|
||||
if test -z "$LTCC"; then
|
||||
eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
|
||||
eval "`$SHELL ${ofile} --config | $GREP '^LTCC='`"
|
||||
if test -z "$LTCC"; then
|
||||
AC_MSG_ERROR([output file `$ofile' does not look like a libtool script])
|
||||
else
|
||||
@ -2310,7 +2309,7 @@ pic_mode=m4_if($#, 1, $1, default)
|
||||
# -------------------
|
||||
# find a file program which can recognise shared library
|
||||
AC_DEFUN([AC_PATH_TOOL_PREFIX],
|
||||
[AC_REQUIRE([AC_PROG_EGREP])dnl
|
||||
[AC_REQUIRE([LT_AC_PROG_EGREP])dnl
|
||||
AC_MSG_CHECKING([for $1])
|
||||
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
|
||||
[case $MAGIC_CMD in
|
||||
@ -2396,6 +2395,7 @@ AC_DEFUN([AC_PROG_LD],
|
||||
[test "$withval" = no || with_gnu_ld=yes],
|
||||
[with_gnu_ld=no])
|
||||
AC_REQUIRE([LT_AC_PROG_SED])dnl
|
||||
AC_REQUIRE([LT_AC_PROG_EGREP])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
||||
@ -2417,7 +2417,7 @@ if test "$GCC" = yes; then
|
||||
re_direlt='/[[^/]][[^/]]*/\.\./'
|
||||
# Canonicalize the pathname of ld
|
||||
ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
|
||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
while echo $ac_prog | $GREP "$re_direlt" > /dev/null 2>&1; do
|
||||
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
|
||||
done
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
@ -2478,8 +2478,7 @@ _LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
|
||||
# AC_PROG_LD_GNU
|
||||
# --------------
|
||||
AC_DEFUN([AC_PROG_LD_GNU],
|
||||
[AC_REQUIRE([AC_PROG_EGREP])dnl
|
||||
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
|
||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
|
||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||
case `$LD -v 2>&1 </dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
@ -2521,7 +2520,8 @@ _LT_DECL([], [reload_cmds], [2])dnl
|
||||
# how to check for library dependencies
|
||||
# -- PORTME fill in with the dynamic library characteristics
|
||||
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
|
||||
[AC_CACHE_CHECK([how to recognise dependent libraries],
|
||||
[AC_REQUIRE([LT_AC_PROG_EGREP])
|
||||
AC_CACHE_CHECK([how to recognise dependent libraries],
|
||||
lt_cv_deplibs_check_method,
|
||||
[lt_cv_file_magic_cmd='$MAGIC_CMD'
|
||||
lt_cv_file_magic_test_file=
|
||||
@ -2570,7 +2570,7 @@ darwin* | rhapsody*)
|
||||
;;
|
||||
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
||||
case $host_cpu in
|
||||
i*86 )
|
||||
# Not sure whether the presence of OpenBSD here was a mistake.
|
||||
@ -2632,7 +2632,7 @@ linux*)
|
||||
;;
|
||||
|
||||
netbsd* | knetbsd*-gnu)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
||||
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
||||
else
|
||||
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
|
||||
@ -2652,7 +2652,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
lt_cv_file_magic_cmd=/usr/bin/file
|
||||
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
||||
else
|
||||
lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
@ -2865,6 +2865,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
|
||||
# ---------------------------------
|
||||
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([LT_AC_PROG_EGREP])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_PROG_LD])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
@ -2968,8 +2969,8 @@ _LT_EOF
|
||||
fi
|
||||
|
||||
# Make sure that we snagged all the symbols we need.
|
||||
if grep ' nm_test_var$' "$nlist" >/dev/null; then
|
||||
if grep ' nm_test_func$' "$nlist" >/dev/null; then
|
||||
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
|
||||
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
|
||||
cat <<_LT_EOF > conftest.$ac_ext
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -2977,7 +2978,7 @@ extern "C" {
|
||||
|
||||
_LT_EOF
|
||||
# Now generate the symbol file.
|
||||
eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
|
||||
eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
|
||||
|
||||
cat <<_LT_EOF >> conftest.$ac_ext
|
||||
#if defined (__STDC__) && __STDC__
|
||||
@ -2995,7 +2996,7 @@ const struct {
|
||||
lt_preloaded_symbols[[]] =
|
||||
{
|
||||
_LT_EOF
|
||||
$SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
|
||||
$SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
|
||||
cat <<\_LT_EOF >> conftest.$ac_ext
|
||||
{0, (lt_ptr_t) 0}
|
||||
};
|
||||
@ -3541,7 +3542,8 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
|
||||
# ------------------------------------
|
||||
# See if the linker supports building shared libraries.
|
||||
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
|
||||
[AC_REQUIRE([AC_PROG_LD])dnl
|
||||
[AC_REQUIRE([LT_AC_PROG_EGREP])dnl
|
||||
AC_REQUIRE([AC_PROG_LD])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
|
||||
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
||||
@ -3551,7 +3553,7 @@ m4_if([$1], [CXX], [
|
||||
aix4* | aix5*)
|
||||
# If we're using GNU nm, then we don't want the "-C" option.
|
||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
||||
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
||||
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
|
||||
else
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
|
||||
@ -3659,7 +3661,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
beos*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
|
||||
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
||||
# support --undefined. This deserves some investigation. FIXME
|
||||
@ -3678,7 +3680,7 @@ _LT_EOF
|
||||
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
|
||||
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
||||
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
|
||||
# If the export-symbols file already is a .def file (1st line
|
||||
# is EXPORTS), use it as is; otherwise, prepend...
|
||||
@ -3695,7 +3697,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
||||
wlarc=
|
||||
else
|
||||
@ -3705,7 +3707,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
solaris* | sysv5*)
|
||||
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
|
||||
if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
cat <<_LT_EOF 1>&2
|
||||
|
||||
@ -3717,7 +3719,7 @@ _LT_EOF
|
||||
*** used, and then restart.
|
||||
|
||||
_LT_EOF
|
||||
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
||||
else
|
||||
@ -3733,7 +3735,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
case `$LD -v 2>&1` in
|
||||
*\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
|
||||
@ -3753,7 +3755,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
||||
else
|
||||
@ -3767,7 +3769,7 @@ _LT_EOF
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|
||||
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
|
||||
@ -3800,7 +3802,7 @@ _LT_EOF
|
||||
else
|
||||
# If we're using GNU nm, then we don't want the "-C" option.
|
||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
||||
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
||||
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
|
||||
else
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
|
||||
@ -3840,7 +3842,7 @@ _LT_EOF
|
||||
# below for broken collect2 doesn't work under 4.3+
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
@ -4098,7 +4100,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
|
||||
@ -4119,7 +4121,7 @@ _LT_EOF
|
||||
openbsd*)
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
@ -4357,7 +4359,7 @@ x|xyes)
|
||||
libname=conftest
|
||||
lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
|
||||
if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
|
||||
if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
|
||||
then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
else
|
||||
@ -4507,7 +4509,8 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
|
||||
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
|
||||
AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
|
||||
m4_define([_LT_AC_LANG_C_CONFIG],
|
||||
[lt_save_CC="$CC"
|
||||
[AC_REQUIRE([LT_AC_PROG_EGREP])
|
||||
lt_save_CC="$CC"
|
||||
AC_LANG_PUSH(C)
|
||||
|
||||
# Source file extension for C test sources.
|
||||
@ -4541,7 +4544,7 @@ if test "$GCC" = no; then
|
||||
fi
|
||||
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
|
||||
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
|
||||
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
|
||||
if echo "$old_CC $old_CFLAGS " | $GREP "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
|
||||
else
|
||||
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
|
||||
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
|
||||
@ -4609,6 +4612,7 @@ CC="$lt_save_CC"
|
||||
AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
|
||||
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
|
||||
[AC_LANG_PUSH(C++)
|
||||
AC_REQUIRE([LT_AC_PROG_EGREP])
|
||||
AC_REQUIRE([AC_PROG_CXX])
|
||||
AC_REQUIRE([AC_PROG_CXXCPP])
|
||||
|
||||
@ -4699,7 +4703,7 @@ if test "$GXX" = yes; then
|
||||
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
|
||||
grep 'no-whole-archive' > /dev/null; then
|
||||
$GREP 'no-whole-archive' > /dev/null; then
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
|
||||
@ -4719,7 +4723,7 @@ if test "$GXX" = yes; then
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
||||
|
||||
else
|
||||
GXX=no
|
||||
@ -4780,7 +4784,7 @@ case $host_os in
|
||||
# below for broken collect2 doesn't work under 4.3+
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
@ -4865,7 +4869,7 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(always_export_symbols, $1)=no
|
||||
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
||||
|
||||
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
||||
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
|
||||
# If the export-symbols file already is a .def file (1st line
|
||||
# is EXPORTS), use it as is; otherwise, prepend...
|
||||
@ -4904,7 +4908,7 @@ case $host_os in
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
if $CC -dumpspecs 2>&1 | $GREP 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
@ -4985,7 +4989,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
*)
|
||||
if test "$GXX" = yes; then
|
||||
@ -5057,7 +5061,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
*)
|
||||
if test "$GXX" = yes; then
|
||||
@ -5122,7 +5126,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
@ -5158,7 +5162,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -5183,7 +5187,7 @@ case $host_os in
|
||||
esac
|
||||
;;
|
||||
netbsd*)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
|
||||
wlarc=
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||
@ -5191,7 +5195,7 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
fi
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
@ -5231,7 +5235,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
*)
|
||||
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
||||
@ -5244,7 +5248,7 @@ case $host_os in
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
||||
|
||||
else
|
||||
# FIXME: insert proper C++ library support
|
||||
@ -5294,7 +5298,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
;;
|
||||
*)
|
||||
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
||||
@ -5307,7 +5311,7 @@ case $host_os in
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
|
||||
|
||||
else
|
||||
# FIXME: insert proper C++ library support
|
||||
@ -5382,7 +5386,7 @@ case $host_os in
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
|
||||
# Archives containing C++ object files must be created using
|
||||
# "CC -xar", where "CC" is the Sun C++ compiler. This is
|
||||
@ -5401,7 +5405,7 @@ case $host_os in
|
||||
# GNU C++ compiler with Solaris linker
|
||||
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
||||
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
|
||||
if $CC --version | grep -v '^2\.7' > /dev/null; then
|
||||
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
|
||||
@ -5409,7 +5413,7 @@ case $host_os in
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
|
||||
output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP \"\-L\""
|
||||
else
|
||||
# g++ 2.7 appears to require `-G' NOT `-shared' on this
|
||||
# platform.
|
||||
@ -5420,7 +5424,7 @@ case $host_os in
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
|
||||
output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP \"\-L\""
|
||||
fi
|
||||
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
|
||||
@ -5858,6 +5862,18 @@ AU_DEFUN([AM_PROG_NM], [AC_PROG_NM])
|
||||
m4_if([AC_DISABLE_FAST_INSTALL])
|
||||
|
||||
|
||||
# LT_AC_PROG_EGREP
|
||||
# ----------------
|
||||
# If we don't have a new enough Autoconf to choose the best grep
|
||||
# available, choose the one first in the user's PATH.
|
||||
AC_DEFUN([LT_AC_PROG_EGREP],
|
||||
[AC_REQUIRE([AC_PROG_EGREP])
|
||||
test -z "$GREP" && GREP=grep
|
||||
_LT_DECL([], [GREP], [1], [A grep program that handles long line])
|
||||
_LT_DECL([], [EGREP], [1], [An ERE matcher])
|
||||
])
|
||||
|
||||
|
||||
# LT_AC_PROG_SED
|
||||
# --------------
|
||||
# Check for a fully-functional sed program, that truncates
|
||||
|
@ -32,7 +32,7 @@ status=$EXIT_SUCCESS
|
||||
scripts="$srcdir/../config/ltmain.sh $srcdir/../libtoolize"
|
||||
|
||||
# Check for bad binary operators.
|
||||
if $EGREP -n -e "if[ ]+[\"']?\\$.*(=|-[lg][te]|-eq|-ne)" $scripts; then
|
||||
if $EGREP -n -e 'if[ ]+["'\'']?\\$[^ ]+[ ]+(=|-[lg][te]|-eq|-ne)' $scripts; then
|
||||
echo "use \`if test \$something =' instead of \`if \$something ='"
|
||||
status=$EXIT_FAILURE
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user