Roll-up of SVN hotplug branch at most recent revision (r1677), based at the same point in the master revision history as it was originally applied.
This commit is contained in:
Ross Bencina
parent
8d0c648b7d
commit
d13fcd8ea9
27 changed files with 2117 additions and 1435 deletions
588
bindings/cpp/aclocal.m4
vendored
588
bindings/cpp/aclocal.m4
vendored
|
|
@ -688,7 +688,7 @@ _LT_CONFIG_SAVE_COMMANDS([
|
|||
# commands through without removal of \ escapes.
|
||||
if test -n "${ZSH_VERSION+set}" ; then
|
||||
setopt NO_GLOB_SUBST
|
||||
fi
|
||||
fi
|
||||
|
||||
cfgfile="${ofile}T"
|
||||
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
|
||||
|
|
@ -1109,104 +1109,104 @@ fi
|
|||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
|
||||
if test -z "$lt_ECHO"; then
|
||||
if test "X${echo_test_string+set}" != Xset; then
|
||||
# find a string as large as possible, as long as the shell can cope with it
|
||||
for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
|
||||
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
|
||||
if test "X${echo_test_string+set}" != Xset; then
|
||||
# find a string as large as possible, as long as the shell can cope with it
|
||||
for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
|
||||
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
|
||||
if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
|
||||
{ test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
|
||||
then
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
then
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
|
||||
echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
:
|
||||
else
|
||||
# The Solaris, AIX, and Digital Unix default echo programs unquote
|
||||
# backslashes. This makes it impossible to quote backslashes using
|
||||
# echo "$something" | sed 's/\\/\\\\/g'
|
||||
#
|
||||
# So, first we look for a working echo in the user's PATH.
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
:
|
||||
else
|
||||
# The Solaris, AIX, and Digital Unix default echo programs unquote
|
||||
# backslashes. This makes it impossible to quote backslashes using
|
||||
# echo "$something" | sed 's/\\/\\\\/g'
|
||||
#
|
||||
# So, first we look for a working echo in the user's PATH.
|
||||
|
||||
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
||||
for dir in $PATH /usr/ucb; do
|
||||
IFS="$lt_save_ifs"
|
||||
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
|
||||
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
|
||||
echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
ECHO="$dir/echo"
|
||||
break
|
||||
fi
|
||||
done
|
||||
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
||||
for dir in $PATH /usr/ucb; do
|
||||
IFS="$lt_save_ifs"
|
||||
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
|
||||
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
|
||||
echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
ECHO="$dir/echo"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$lt_save_ifs"
|
||||
|
||||
if test "X$ECHO" = Xecho; then
|
||||
# We didn't find a better echo, so look for alternatives.
|
||||
# We didn't find a better echo, so look for alternatives.
|
||||
if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
|
||||
echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
# This shell has a builtin print -r that does the trick.
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
# This shell has a builtin print -r that does the trick.
|
||||
ECHO='print -r'
|
||||
elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
|
||||
test "X$CONFIG_SHELL" != X/bin/ksh; then
|
||||
# If we have ksh, try running configure again with it.
|
||||
ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
export ORIGINAL_CONFIG_SHELL
|
||||
CONFIG_SHELL=/bin/ksh
|
||||
export CONFIG_SHELL
|
||||
exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
|
||||
else
|
||||
# Try using printf.
|
||||
test "X$CONFIG_SHELL" != X/bin/ksh; then
|
||||
# If we have ksh, try running configure again with it.
|
||||
ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
export ORIGINAL_CONFIG_SHELL
|
||||
CONFIG_SHELL=/bin/ksh
|
||||
export CONFIG_SHELL
|
||||
exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
|
||||
else
|
||||
# Try using printf.
|
||||
ECHO='printf %s\n'
|
||||
if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
|
||||
echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
# Cool, printf works
|
||||
:
|
||||
elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = 'X\t' &&
|
||||
echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
# Cool, printf works
|
||||
:
|
||||
elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = 'X\t' &&
|
||||
echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
|
||||
export CONFIG_SHELL
|
||||
SHELL="$CONFIG_SHELL"
|
||||
export SHELL
|
||||
CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
|
||||
export CONFIG_SHELL
|
||||
SHELL="$CONFIG_SHELL"
|
||||
export SHELL
|
||||
ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
|
||||
elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = 'X\t' &&
|
||||
echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = 'X\t' &&
|
||||
echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
|
||||
test "X$echo_testing_string" = "X$echo_test_string"; then
|
||||
ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
|
||||
else
|
||||
# maybe with a smaller string...
|
||||
prev=:
|
||||
else
|
||||
# maybe with a smaller string...
|
||||
prev=:
|
||||
|
||||
for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
|
||||
for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
|
||||
if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
|
||||
then
|
||||
break
|
||||
fi
|
||||
prev="$cmd"
|
||||
done
|
||||
|
||||
if test "$prev" != 'sed 50q "[$]0"'; then
|
||||
echo_test_string=`eval $prev`
|
||||
export echo_test_string
|
||||
exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
|
||||
else
|
||||
# Oops. We lost completely, so just stick with echo.
|
||||
ECHO=echo
|
||||
then
|
||||
break
|
||||
fi
|
||||
fi
|
||||
prev="$cmd"
|
||||
done
|
||||
|
||||
if test "$prev" != 'sed 50q "[$]0"'; then
|
||||
echo_test_string=`eval $prev`
|
||||
export echo_test_string
|
||||
exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
|
||||
else
|
||||
# Oops. We lost completely, so just stick with echo.
|
||||
ECHO=echo
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy echo and quote the copy suitably for passing to libtool from
|
||||
# the Makefile, instead of quoting the original, which is used later.
|
||||
|
|
@ -1228,7 +1228,7 @@ _LT_DECL([], [ECHO], [1],
|
|||
m4_defun([_LT_ENABLE_LOCK],
|
||||
[AC_ARG_ENABLE([libtool-lock],
|
||||
[AS_HELP_STRING([--disable-libtool-lock],
|
||||
[avoid locking (might break parallel builds)])])
|
||||
[avoid locking (might break parallel builds)])])
|
||||
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
||||
|
||||
# Some flags need to be propagated to the compiler or linker for good
|
||||
|
|
@ -1239,12 +1239,12 @@ ia64-*-hpux*)
|
|||
echo 'int i;' > conftest.$ac_ext
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
case `/usr/bin/file conftest.$ac_objext` in
|
||||
*ELF-32*)
|
||||
HPUX_IA64_MODE="32"
|
||||
;;
|
||||
*ELF-64*)
|
||||
HPUX_IA64_MODE="64"
|
||||
;;
|
||||
*ELF-32*)
|
||||
HPUX_IA64_MODE="32"
|
||||
;;
|
||||
*ELF-64*)
|
||||
HPUX_IA64_MODE="64"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
rm -rf conftest*
|
||||
|
|
@ -1253,31 +1253,31 @@ ia64-*-hpux*)
|
|||
# Find out which ABI we are using.
|
||||
echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
if test "$lt_cv_prog_gnu_ld" = yes; then
|
||||
case `/usr/bin/file conftest.$ac_objext` in
|
||||
*32-bit*)
|
||||
LD="${LD-ld} -melf32bsmip"
|
||||
;;
|
||||
*N32*)
|
||||
LD="${LD-ld} -melf32bmipn32"
|
||||
;;
|
||||
*64-bit*)
|
||||
LD="${LD-ld} -melf64bmip"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
case `/usr/bin/file conftest.$ac_objext` in
|
||||
*32-bit*)
|
||||
LD="${LD-ld} -32"
|
||||
;;
|
||||
*N32*)
|
||||
LD="${LD-ld} -n32"
|
||||
;;
|
||||
*64-bit*)
|
||||
LD="${LD-ld} -64"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if test "$lt_cv_prog_gnu_ld" = yes; then
|
||||
case `/usr/bin/file conftest.$ac_objext` in
|
||||
*32-bit*)
|
||||
LD="${LD-ld} -melf32bsmip"
|
||||
;;
|
||||
*N32*)
|
||||
LD="${LD-ld} -melf32bmipn32"
|
||||
;;
|
||||
*64-bit*)
|
||||
LD="${LD-ld} -melf64bmip"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
case `/usr/bin/file conftest.$ac_objext` in
|
||||
*32-bit*)
|
||||
LD="${LD-ld} -32"
|
||||
;;
|
||||
*N32*)
|
||||
LD="${LD-ld} -n32"
|
||||
;;
|
||||
*64-bit*)
|
||||
LD="${LD-ld} -64"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
rm -rf conftest*
|
||||
;;
|
||||
|
|
@ -1288,44 +1288,44 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|||
echo 'int i;' > conftest.$ac_ext
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
case `/usr/bin/file conftest.o` in
|
||||
*32-bit*)
|
||||
case $host in
|
||||
*32-bit*)
|
||||
case $host in
|
||||
x86_64-*kfreebsd*-gnu)
|
||||
LD="${LD-ld} -m elf_i386_fbsd"
|
||||
;;
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
ppc64-*linux*|powerpc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
LD="${LD-ld} -m elf_s390"
|
||||
;;
|
||||
sparc64-*linux*)
|
||||
LD="${LD-ld} -m elf32_sparc"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*64-bit*)
|
||||
case $host in
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
ppc64-*linux*|powerpc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
LD="${LD-ld} -m elf_s390"
|
||||
;;
|
||||
sparc64-*linux*)
|
||||
LD="${LD-ld} -m elf32_sparc"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*64-bit*)
|
||||
case $host in
|
||||
x86_64-*kfreebsd*-gnu)
|
||||
LD="${LD-ld} -m elf_x86_64_fbsd"
|
||||
;;
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_x86_64"
|
||||
;;
|
||||
ppc*-*linux*|powerpc*-*linux*)
|
||||
LD="${LD-ld} -m elf64ppc"
|
||||
;;
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_x86_64"
|
||||
;;
|
||||
ppc*-*linux*|powerpc*-*linux*)
|
||||
LD="${LD-ld} -m elf64ppc"
|
||||
;;
|
||||
s390*-*linux*|s390*-*tpf*)
|
||||
LD="${LD-ld} -m elf64_s390"
|
||||
;;
|
||||
sparc*-*linux*)
|
||||
LD="${LD-ld} -m elf64_sparc"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
LD="${LD-ld} -m elf64_s390"
|
||||
;;
|
||||
sparc*-*linux*)
|
||||
LD="${LD-ld} -m elf64_sparc"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
rm -rf conftest*
|
||||
|
|
@ -1462,7 +1462,7 @@ dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
|
|||
|
||||
|
||||
# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
|
||||
# [ACTION-SUCCESS], [ACTION-FAILURE])
|
||||
# [ACTION-SUCCESS], [ACTION-FAILURE])
|
||||
# ----------------------------------------------------
|
||||
# Check whether the given linker option works
|
||||
AC_DEFUN([_LT_LINKER_OPTION],
|
||||
|
|
@ -1586,7 +1586,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|||
sysv5* | sco5v6* | sysv4.2uw2*)
|
||||
kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
|
||||
if test -n "$kargmax"; then
|
||||
lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
|
||||
lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
|
||||
else
|
||||
lt_cv_sys_max_cmd_len=32768
|
||||
fi
|
||||
|
|
@ -1603,23 +1603,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|||
teststring=$teststring$teststring
|
||||
done
|
||||
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
# we can't tell.
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
# we can't tell.
|
||||
while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
|
||||
= "XX$teststring$teststring"; } >/dev/null 2>&1 &&
|
||||
test $i != 17 # 1/2 MB should be enough
|
||||
do
|
||||
i=`expr $i + 1`
|
||||
teststring=$teststring$teststring
|
||||
done
|
||||
test $i != 17 # 1/2 MB should be enough
|
||||
do
|
||||
i=`expr $i + 1`
|
||||
teststring=$teststring$teststring
|
||||
done
|
||||
# Only check the string length outside the loop.
|
||||
lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
|
||||
teststring=
|
||||
teststring=
|
||||
# Add a significant safety factor because C++ compilers can tack on
|
||||
# massive amounts of additional arguments before passing them to the
|
||||
# linker. It appears as though 1/2 is a usable value.
|
||||
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
|
||||
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1648,7 +1648,7 @@ m4_defun([_LT_HEADER_DLFCN],
|
|||
|
||||
|
||||
# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
|
||||
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
|
||||
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
|
||||
# ----------------------------------------------------------------
|
||||
m4_defun([_LT_TRY_DLOPEN_SELF],
|
||||
[m4_require([_LT_HEADER_DLFCN])dnl
|
||||
|
|
@ -1756,12 +1756,12 @@ else
|
|||
mingw* | pw32* | cegcc*)
|
||||
lt_cv_dlopen="LoadLibrary"
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
;;
|
||||
|
||||
cygwin*)
|
||||
lt_cv_dlopen="dlopen"
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
;;
|
||||
|
||||
darwin*)
|
||||
# if libdl is installed we need to link against it
|
||||
|
|
@ -1771,7 +1771,7 @@ else
|
|||
lt_cv_dlopen_libs=
|
||||
lt_cv_dlopen_self=yes
|
||||
])
|
||||
;;
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_CHECK_FUNC([shl_load],
|
||||
|
|
@ -1821,7 +1821,7 @@ else
|
|||
if test "x$lt_cv_dlopen_self" = xyes; then
|
||||
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
|
||||
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
|
||||
lt_cv_dlopen_self_static, [dnl
|
||||
lt_cv_dlopen_self_static, [dnl
|
||||
_LT_TRY_DLOPEN_SELF(
|
||||
lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
|
||||
lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
|
||||
|
|
@ -2024,17 +2024,17 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
|
|||
else
|
||||
# FIXME - insert some real tests, host_os isn't really good enough
|
||||
case $host_os in
|
||||
darwin*)
|
||||
if test -n "$STRIP" ; then
|
||||
striplib="$STRIP -x"
|
||||
darwin*)
|
||||
if test -n "$STRIP" ; then
|
||||
striplib="$STRIP -x"
|
||||
old_striplib="$STRIP -S"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -2188,10 +2188,10 @@ amigaos*)
|
|||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
;;
|
||||
m68k)
|
||||
library_names_spec='$libname.ixlibrary $libname.a'
|
||||
# Create ${libname}_ixlibrary.a entries in /sys/libs.
|
||||
library_names_spec='$libname.ixlibrary $libname.a'
|
||||
# Create ${libname}_ixlibrary.a entries in /sys/libs.
|
||||
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
|
|
@ -2226,7 +2226,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|||
library_names_spec='$libname.dll.a'
|
||||
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
||||
postinstall_cmds='base_file=`basename \${file}`~
|
||||
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
|
||||
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
|
||||
dldir=$destdir/`dirname \$dlpath`~
|
||||
test -d \$dldir || mkdir -p \$dldir~
|
||||
$install_prog $dir/$dlname \$dldir/$dlname~
|
||||
|
|
@ -2381,18 +2381,18 @@ hpux9* | hpux10* | hpux11*)
|
|||
fi
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
hppa*64*)
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
|
|
@ -2555,8 +2555,8 @@ openbsd*)
|
|||
need_lib_prefix=no
|
||||
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
|
||||
case $host_os in
|
||||
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
|
||||
*) need_version=no ;;
|
||||
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
|
||||
*) need_version=no ;;
|
||||
esac
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
|
|
@ -2710,10 +2710,10 @@ fi
|
|||
|
||||
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
|
||||
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
|
||||
fi
|
||||
fi
|
||||
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
|
||||
sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
|
||||
fi
|
||||
fi
|
||||
|
||||
_LT_DECL([], [variables_saved_for_relink], [1],
|
||||
[Variables whose values should be saved in libtool wrapper scripts and
|
||||
|
|
@ -3030,8 +3030,8 @@ mingw* | pw32*)
|
|||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
else
|
||||
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
||||
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -3199,7 +3199,7 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
|
|||
lt_cv_path_NM="$NM"
|
||||
else
|
||||
lt_nm_to_check="${ac_tool_prefix}nm"
|
||||
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
|
||||
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
|
||||
lt_nm_to_check="$lt_nm_to_check nm"
|
||||
fi
|
||||
for lt_tmp_nm in $lt_nm_to_check; do
|
||||
|
|
@ -3238,7 +3238,7 @@ else
|
|||
: ${lt_cv_path_NM=no}
|
||||
fi])
|
||||
if test "$lt_cv_path_NM" != "no"; then
|
||||
NM="$lt_cv_path_NM"
|
||||
NM="$lt_cv_path_NM"
|
||||
else
|
||||
# Didn't find any BSD compatible name lister, look for dumpbin.
|
||||
AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
|
||||
|
|
@ -3430,7 +3430,7 @@ for ac_symprfx in "" "_"; do
|
|||
" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
|
||||
" ' prfx=^$ac_symprfx]"
|
||||
else
|
||||
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
|
||||
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
|
||||
fi
|
||||
|
||||
# Check to see that the pipe works correctly.
|
||||
|
|
@ -3475,7 +3475,7 @@ _LT_EOF
|
|||
|
||||
cat <<_LT_EOF >> conftest.$ac_ext
|
||||
|
||||
/* The mapping between symbol names and symbols. */
|
||||
/* The mapping between symbol names and symbols. */
|
||||
const struct {
|
||||
const char *name;
|
||||
void *address;
|
||||
|
|
@ -3587,11 +3587,11 @@ m4_if([$1], [CXX], [
|
|||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
||||
;;
|
||||
m68k)
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
|
|
@ -3766,11 +3766,11 @@ m4_if([$1], [CXX], [
|
|||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
lynxos*)
|
||||
;;
|
||||
m88k*)
|
||||
|
|
@ -3893,11 +3893,11 @@ m4_if([$1], [CXX], [
|
|||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
||||
;;
|
||||
m68k)
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
|
|
@ -3958,10 +3958,10 @@ m4_if([$1], [CXX], [
|
|||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
*)
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
else
|
||||
# PORTME Check for flag to pass linker flags through the system compiler.
|
||||
case $host_os in
|
||||
|
|
@ -4057,8 +4057,8 @@ m4_if([$1], [CXX], [
|
|||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
|
|
@ -4217,7 +4217,7 @@ m4_if([$1], [CXX], [
|
|||
;;
|
||||
esac
|
||||
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
||||
], [
|
||||
],[
|
||||
runpath_var=
|
||||
_LT_TAGVAR(allow_undefined_flag, $1)=
|
||||
_LT_TAGVAR(always_export_symbols, $1)=no
|
||||
|
|
@ -4295,7 +4295,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
|||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
else
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)=
|
||||
fi
|
||||
supports_anon_versioning=no
|
||||
|
|
@ -4332,7 +4332,7 @@ _LT_EOF
|
|||
# see comment about AmigaOS4 .so support
|
||||
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)=''
|
||||
;;
|
||||
;;
|
||||
m68k)
|
||||
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
|
|
@ -4405,14 +4405,14 @@ _LT_EOF
|
|||
tmp_addflag=
|
||||
tmp_sharedflag='-shared'
|
||||
case $cc_basename,$host_cpu in
|
||||
pgcc*) # Portland Group C compiler
|
||||
pgcc*) # Portland Group C compiler
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
||||
tmp_addflag=' $pic_flag'
|
||||
;;
|
||||
pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
||||
tmp_addflag=' $pic_flag -Mnomain' ;;
|
||||
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
|
||||
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
|
||||
tmp_addflag=' -i_dynamic' ;;
|
||||
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
|
||||
tmp_addflag=' -i_dynamic -nofor_main' ;;
|
||||
|
|
@ -4437,10 +4437,10 @@ _LT_EOF
|
|||
|
||||
if test "x$supports_anon_versioning" = xyes; then
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
||||
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
||||
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
||||
echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
|
||||
fi
|
||||
fi
|
||||
|
||||
case $cc_basename in
|
||||
xlf*)
|
||||
|
|
@ -4495,7 +4495,7 @@ _LT_EOF
|
|||
|
||||
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
|
||||
case `$LD -v 2>&1` in
|
||||
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
|
||||
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
|
||||
_LT_TAGVAR(ld_shlibs, $1)=no
|
||||
cat <<_LT_EOF 1>&2
|
||||
|
||||
|
|
@ -4586,10 +4586,10 @@ _LT_EOF
|
|||
# need to do runtime linking.
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
|
@ -4619,14 +4619,14 @@ _LT_EOF
|
|||
if test -f "$collect2name" &&
|
||||
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
# We have reworked collect2
|
||||
:
|
||||
else
|
||||
# We have old collect2
|
||||
# We have old collect2
|
||||
_LT_TAGVAR(hardcode_direct, $1)=unsupported
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
# It fails to find uninstalled libraries when the uninstalled
|
||||
# path is not listed in the libpath. Setting hardcode_minus_L
|
||||
# to unsupported forces relinking
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=yes
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
|
|
@ -4641,8 +4641,8 @@ _LT_EOF
|
|||
else
|
||||
# not using gcc
|
||||
if test "$host_cpu" = ia64; then
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
||||
# chokes on -Wl,-G. The following line is correct:
|
||||
shared_flag='-G'
|
||||
else
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
|
|
@ -4666,7 +4666,7 @@ _LT_EOF
|
|||
_LT_SYS_MODULE_PATH_AIX
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
||||
else
|
||||
else
|
||||
if test "$host_cpu" = ia64; then
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
|
||||
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
|
||||
|
|
@ -4695,7 +4695,7 @@ _LT_EOF
|
|||
# see comment about AmigaOS4 .so support
|
||||
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)=''
|
||||
;;
|
||||
;;
|
||||
m68k)
|
||||
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
|
|
@ -4731,7 +4731,7 @@ _LT_EOF
|
|||
|
||||
darwin* | rhapsody*)
|
||||
_LT_DARWIN_LINKER_FEATURES($1)
|
||||
;;
|
||||
;;
|
||||
|
||||
dgux*)
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
|
|
@ -4908,18 +4908,18 @@ _LT_EOF
|
|||
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
else
|
||||
case $host_os in
|
||||
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
||||
else
|
||||
case $host_os in
|
||||
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
*)
|
||||
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
else
|
||||
_LT_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
|
|
@ -4974,7 +4974,7 @@ _LT_EOF
|
|||
else
|
||||
case `$CC -V 2>&1` in
|
||||
*"Compilers 5.0"*)
|
||||
wlarc=''
|
||||
wlarc=''
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
|
||||
|
|
@ -4995,7 +4995,7 @@ _LT_EOF
|
|||
# The compiler driver will combine and reorder linker options,
|
||||
# but understands `-z linker_flag'. GCC discards it without `$wl',
|
||||
# but is careful enough not to reorder.
|
||||
# Supported since Solaris 2.6 (maybe 2.5.1?)
|
||||
# Supported since Solaris 2.6 (maybe 2.5.1?)
|
||||
if test "$GCC" = yes; then
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
|
||||
else
|
||||
|
|
@ -5116,7 +5116,7 @@ _LT_EOF
|
|||
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
])
|
||||
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
|
||||
|
|
@ -5735,7 +5735,7 @@ if test "$_lt_caught_CXX_error" != 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.
|
||||
#
|
||||
#
|
||||
# There doesn't appear to be a way to prevent this compiler from
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
|
|
@ -5800,7 +5800,7 @@ if test "$_lt_caught_CXX_error" != 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.
|
||||
#
|
||||
#
|
||||
# There doesn't appear to be a way to prevent this compiler from
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
|
|
@ -5885,7 +5885,7 @@ if test "$_lt_caught_CXX_error" != 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.
|
||||
#
|
||||
#
|
||||
# There doesn't appear to be a way to prevent this compiler from
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
|
|
@ -5968,7 +5968,7 @@ if test "$_lt_caught_CXX_error" != 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.
|
||||
#
|
||||
#
|
||||
# There doesn't appear to be a way to prevent this compiler from
|
||||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
|
|
@ -6995,7 +6995,7 @@ AC_DEFUN([LT_PROG_GCJ],
|
|||
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
|
||||
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
|
||||
[AC_CHECK_TOOL(GCJ, gcj,)
|
||||
test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
|
||||
test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
|
||||
AC_SUBST(GCJFLAGS)])])[]dnl
|
||||
])
|
||||
|
||||
|
|
@ -8317,44 +8317,44 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|||
shift
|
||||
for mf
|
||||
do
|
||||
# Strip MF so we end up with the name of the file.
|
||||
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile or not.
|
||||
# We used to match only the files named `Makefile.in', but
|
||||
# some people rename them; so instead we look at the file content.
|
||||
# Grep'ing the first line is not enough: some people post-process
|
||||
# each Makefile.in and add a new line on top of each file to say so.
|
||||
# Strip MF so we end up with the name of the file.
|
||||
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile or not.
|
||||
# We used to match only the files named `Makefile.in', but
|
||||
# some people rename them; so instead we look at the file content.
|
||||
# Grep'ing the first line is not enough: some people post-process
|
||||
# each Makefile.in and add a new line on top of each file to say so.
|
||||
# Grep'ing the whole file is not good either: AIX grep has a line
|
||||
# limit of 2048, but all sed's we know have understand at least 4000.
|
||||
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
||||
dirpart=`AS_DIRNAME("$mf")`
|
||||
else
|
||||
continue
|
||||
fi
|
||||
# Extract the definition of DEPDIR, am__include, and am__quote
|
||||
# from the Makefile without running `make'.
|
||||
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
||||
test -z "$DEPDIR" && continue
|
||||
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
||||
test -z "am__include" && continue
|
||||
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
||||
# When using ansi2knr, U may be empty or an underscore; expand it
|
||||
U=`sed -n 's/^U = //p' < "$mf"`
|
||||
# Find all dependency output files, they are included files with
|
||||
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
||||
# simplest approach to changing $(DEPDIR) to its actual value in the
|
||||
# expansion.
|
||||
for file in `sed -n "
|
||||
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
||||
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
||||
# Make sure the directory exists.
|
||||
test -f "$dirpart/$file" && continue
|
||||
fdir=`AS_DIRNAME(["$file"])`
|
||||
AS_MKDIR_P([$dirpart/$fdir])
|
||||
# echo "creating $dirpart/$file"
|
||||
echo '# dummy' > "$dirpart/$file"
|
||||
done
|
||||
dirpart=`AS_DIRNAME("$mf")`
|
||||
else
|
||||
continue
|
||||
fi
|
||||
# Extract the definition of DEPDIR, am__include, and am__quote
|
||||
# from the Makefile without running `make'.
|
||||
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
||||
test -z "$DEPDIR" && continue
|
||||
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
||||
test -z "am__include" && continue
|
||||
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
||||
# When using ansi2knr, U may be empty or an underscore; expand it
|
||||
U=`sed -n 's/^U = //p' < "$mf"`
|
||||
# Find all dependency output files, they are included files with
|
||||
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
||||
# simplest approach to changing $(DEPDIR) to its actual value in the
|
||||
# expansion.
|
||||
for file in `sed -n "
|
||||
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
||||
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
||||
# Make sure the directory exists.
|
||||
test -f "$dirpart/$file" && continue
|
||||
fdir=`AS_DIRNAME(["$file"])`
|
||||
AS_MKDIR_P([$dirpart/$fdir])
|
||||
# echo "creating $dirpart/$file"
|
||||
echo '# dummy' > "$dirpart/$file"
|
||||
done
|
||||
done
|
||||
}
|
||||
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
|
||||
|
|
@ -8408,10 +8408,10 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
|
|||
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
|
||||
# is not polluted with repeated "-I."
|
||||
AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
|
||||
# test to see if srcdir already configured
|
||||
# test to see if srcdir already configured
|
||||
if test -f $srcdir/config.status; then
|
||||
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
||||
fi
|
||||
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
||||
fi
|
||||
fi
|
||||
|
||||
# test whether we have cygpath
|
||||
|
|
@ -8458,17 +8458,17 @@ AC_REQUIRE([AC_PROG_AWK])dnl
|
|||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
||||
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
||||
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
||||
[_AM_PROG_TAR([v7])])])
|
||||
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
||||
[_AM_PROG_TAR([v7])])])
|
||||
_AM_IF_OPTION([no-dependencies],,
|
||||
[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
||||
[_AM_DEPENDENCIES(CC)],
|
||||
[define([AC_PROG_CC],
|
||||
defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
||||
[_AM_DEPENDENCIES(CC)],
|
||||
[define([AC_PROG_CC],
|
||||
defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
||||
AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
||||
[_AM_DEPENDENCIES(CXX)],
|
||||
[define([AC_PROG_CXX],
|
||||
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
||||
[_AM_DEPENDENCIES(CXX)],
|
||||
[define([AC_PROG_CXX],
|
||||
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
||||
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
||||
[_AM_DEPENDENCIES(OBJC)],
|
||||
[define([AC_PROG_OBJC],
|
||||
|
|
@ -8623,9 +8623,9 @@ echo "include confinc" > confmf
|
|||
# Ignore all kinds of additional output from `make'.
|
||||
case `$am_make -s -f confmf 2> /dev/null` in #(
|
||||
*the\ am__doit\ target*)
|
||||
am__include=include
|
||||
am__quote=
|
||||
_am_result=GNU
|
||||
am__include=include
|
||||
am__quote=
|
||||
_am_result=GNU
|
||||
;;
|
||||
esac
|
||||
# Now try BSD make style include.
|
||||
|
|
@ -8633,12 +8633,12 @@ if test "$am__include" = "#"; then
|
|||
echo '.include "confinc"' > confmf
|
||||
case `$am_make -s -f confmf 2> /dev/null` in #(
|
||||
*the\ am__doit\ target*)
|
||||
am__include=.include
|
||||
am__quote="\""
|
||||
_am_result=BSD
|
||||
am__include=.include
|
||||
am__quote="\""
|
||||
_am_result=BSD
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([am__include])
|
||||
AC_SUBST([am__quote])
|
||||
AC_MSG_RESULT([$_am_result])
|
||||
|
|
|
|||
Loading…
Reference in a new issue