forked from minhngoc25a/freetype2
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
--copy' from libtool 1.5.2. * builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from automake 1.8a. * builds/unix/configure: Regenerated with autoconf 2.59a.
This commit is contained in:
Werner Lemberg
parent
b0ae1bfb3c
commit
41a407e60e
|
|
@ -1,3 +1,11 @@
|
|||
2004-04-02 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
|
||||
--copy' from libtool 1.5.2.
|
||||
* builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from
|
||||
automake 1.8a.
|
||||
* builds/unix/configure: Regenerated with autoconf 2.59a.
|
||||
|
||||
2004-04-01 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* builds/unix/ft-munmap.m4 (FT_MUNMAP_PARAM): Fix arguments of
|
||||
|
|
|
|||
|
|
@ -491,7 +491,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
|
|||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
ppc64-*linux*)
|
||||
ppc64-*linux*|powerpc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
|
|
@ -555,7 +555,8 @@ need_locks="$enable_libtool_lock"
|
|||
# ----------------------------------------------------------------
|
||||
# Check whether the given compiler option works
|
||||
AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
|
||||
[AC_CACHE_CHECK([$1], [$2],
|
||||
[AC_REQUIRE([LT_AC_PROG_SED])
|
||||
AC_CACHE_CHECK([$1], [$2],
|
||||
[$2=no
|
||||
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
|
||||
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
|
|
@ -660,6 +661,12 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
amigaos*)
|
||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
||||
# So we just punt and use a minimum line length of 8192.
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
*)
|
||||
# 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
|
||||
|
|
@ -823,7 +830,7 @@ else
|
|||
lt_cv_dlopen_self=yes
|
||||
])
|
||||
;;
|
||||
|
||||
|
||||
*)
|
||||
AC_CHECK_FUNC([shl_load],
|
||||
[lt_cv_dlopen="shl_load"],
|
||||
|
|
@ -912,13 +919,6 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
|
|||
mkdir out
|
||||
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
|
||||
# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
|
||||
# that will create temporary files in the current directory regardless of
|
||||
# the output directory. Thus, making CWD read-only will cause this test
|
||||
# to fail, enabling locking or at least warning the user not to do parallel
|
||||
# builds.
|
||||
chmod -w .
|
||||
|
||||
lt_compiler_flag="-o out/conftest2.$ac_objext"
|
||||
# Insert the option either (1) after the last *FLAGS variable, or
|
||||
# (2) before a word containing "conftest.", or (3) at the end.
|
||||
|
|
@ -942,8 +942,11 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
|
|||
fi
|
||||
fi
|
||||
chmod u+w .
|
||||
$rm conftest* out/*
|
||||
rmdir out
|
||||
$rm conftest*
|
||||
# SGI C++ compiler will create directory out/ii_files/ for
|
||||
# template instantiation
|
||||
test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
|
||||
$rm out/* && rmdir out
|
||||
cd ..
|
||||
rmdir conftest
|
||||
$rm conftest*
|
||||
|
|
@ -1060,7 +1063,7 @@ fi
|
|||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
fi
|
||||
])# AC_LIBTOOL_SYS_LIB_STRIP
|
||||
|
||||
|
|
@ -1161,7 +1164,7 @@ aix4* | aix5*)
|
|||
amigaos*)
|
||||
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'
|
||||
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'
|
||||
;;
|
||||
|
||||
beos*)
|
||||
|
|
@ -1208,7 +1211,7 @@ cygwin* | mingw* | pw32*)
|
|||
cygwin*)
|
||||
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
||||
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
|
||||
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
;;
|
||||
mingw*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
|
|
@ -1247,17 +1250,16 @@ darwin* | rhapsody*)
|
|||
version_type=darwin
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes.
|
||||
library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
|
||||
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"`
|
||||
else
|
||||
sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
|
||||
fi
|
||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
||||
;;
|
||||
|
|
@ -1275,6 +1277,18 @@ freebsd1*)
|
|||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
kfreebsd*-gnu)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker='GNU ld.so'
|
||||
;;
|
||||
|
||||
freebsd*)
|
||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
||||
version_type=freebsd-$objformat
|
||||
|
|
@ -1418,6 +1432,12 @@ linux*)
|
|||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
# powerpc, because MkLinux only supported shared libraries with the
|
||||
# GNU dynamic linker. Since this was broken with cross compilers,
|
||||
|
|
@ -1427,6 +1447,18 @@ linux*)
|
|||
dynamic_linker='GNU/Linux ld.so'
|
||||
;;
|
||||
|
||||
knetbsd*-gnu)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker='GNU ld.so'
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
|
|
@ -1436,7 +1468,7 @@ netbsd*)
|
|||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
dynamic_linker='NetBSD (a.out) ld.so'
|
||||
else
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
dynamic_linker='NetBSD ld.elf_so'
|
||||
fi
|
||||
|
|
@ -1452,7 +1484,7 @@ newsos6)
|
|||
shlibpath_overrides_runpath=yes
|
||||
;;
|
||||
|
||||
nto-qnx)
|
||||
nto-qnx*)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
|
|
@ -1465,7 +1497,7 @@ nto-qnx)
|
|||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
need_version=yes
|
||||
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
|
||||
|
|
@ -1921,7 +1953,7 @@ fi
|
|||
|
||||
# AC_PROG_LD
|
||||
# ----------
|
||||
# find the path to the GNU or non-GNU linker
|
||||
# find the pathname to the GNU or non-GNU linker
|
||||
AC_DEFUN([AC_PROG_LD],
|
||||
[AC_ARG_WITH([gnu-ld],
|
||||
[AC_HELP_STRING([--with-gnu-ld],
|
||||
|
|
@ -1947,7 +1979,7 @@ if test "$GCC" = yes; then
|
|||
# Accept absolute paths.
|
||||
[[\\/]]* | ?:[[\\/]]*)
|
||||
re_direlt='/[[^/]][[^/]]*/\.\./'
|
||||
# Canonicalize the path of ld
|
||||
# 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
|
||||
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
|
||||
|
|
@ -2010,7 +2042,7 @@ 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,
|
||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||
case `"$LD" -v 2>&1 </dev/null` in
|
||||
case `$LD -v 2>&1 </dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
lt_cv_prog_gnu_ld=yes
|
||||
;;
|
||||
|
|
@ -2075,28 +2107,24 @@ bsdi4*)
|
|||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
;;
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
cygwin*)
|
||||
# win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='win32_libid'
|
||||
;;
|
||||
|
||||
mingw* | pw32*)
|
||||
# Base MSYS/MinGW do not provide the 'file' command needed by
|
||||
# win32_libid shell function, so use a weaker test based on 'objdump'.
|
||||
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
||||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
# this will be overwritten by pass_all, but leave it in just in case
|
||||
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
|
||||
lt_cv_file_magic_cmd='/usr/bin/file -L'
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
|
||||
;;
|
||||
esac
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
freebsd*)
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
case $host_cpu in
|
||||
i*86 )
|
||||
|
|
@ -2135,36 +2163,27 @@ hpux10.20* | hpux11*)
|
|||
;;
|
||||
|
||||
irix5* | irix6* | nonstopux*)
|
||||
case $host_os in
|
||||
irix5* | nonstopux*)
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
|
||||
;;
|
||||
*)
|
||||
case $LD in
|
||||
*-32|*"-32 ") libmagic=32-bit;;
|
||||
*-n32|*"-n32 ") libmagic=N32;;
|
||||
*-64|*"-64 ") libmagic=64-bit;;
|
||||
*) libmagic=never-match;;
|
||||
esac
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
|
||||
;;
|
||||
case $LD in
|
||||
*-32|*"-32 ") libmagic=32-bit;;
|
||||
*-n32|*"-n32 ") libmagic=N32;;
|
||||
*-64|*"-64 ") libmagic=64-bit;;
|
||||
*) libmagic=never-match;;
|
||||
esac
|
||||
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
# This must be Linux ELF.
|
||||
linux*)
|
||||
case $host_cpu in
|
||||
alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
|
||||
alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
|
||||
lt_cv_deplibs_check_method=pass_all ;;
|
||||
*)
|
||||
# glibc up to 2.1.1 does not perform some relocations on ARM
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
|
||||
esac
|
||||
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
|
|
@ -2181,7 +2200,7 @@ newos6*)
|
|||
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
||||
;;
|
||||
|
||||
nto-qnx)
|
||||
nto-qnx*)
|
||||
lt_cv_deplibs_check_method=unknown
|
||||
;;
|
||||
|
||||
|
|
@ -2196,9 +2215,6 @@ openbsd*)
|
|||
;;
|
||||
|
||||
osf3* | osf4* | osf5*)
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
|
||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
|
|
@ -2208,7 +2224,6 @@ sco3.2v5*)
|
|||
|
||||
solaris*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
lt_cv_file_magic_test_file=/lib/libc.so
|
||||
;;
|
||||
|
||||
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
||||
|
|
@ -2248,7 +2263,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
|
|||
|
||||
# AC_PROG_NM
|
||||
# ----------
|
||||
# find the path to a BSD-compatible name lister
|
||||
# find the pathname to a BSD-compatible name lister
|
||||
AC_DEFUN([AC_PROG_NM],
|
||||
[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
|
||||
[if test -n "$NM"; then
|
||||
|
|
@ -2386,7 +2401,7 @@ AC_DEFUN([AC_LIBTOOL_CXX],
|
|||
AC_DEFUN([_LT_AC_LANG_CXX],
|
||||
[AC_REQUIRE([AC_PROG_CXX])
|
||||
AC_REQUIRE([AC_PROG_CXXCPP])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
|
||||
])# _LT_AC_LANG_CXX
|
||||
|
||||
|
||||
|
|
@ -2402,7 +2417,7 @@ AC_DEFUN([AC_LIBTOOL_F77],
|
|||
# ---------------
|
||||
AC_DEFUN([_LT_AC_LANG_F77],
|
||||
[AC_REQUIRE([AC_PROG_F77])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
|
||||
])# _LT_AC_LANG_F77
|
||||
|
||||
|
||||
|
|
@ -2423,7 +2438,7 @@ AC_DEFUN([_LT_AC_LANG_GCJ],
|
|||
[ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
|
||||
[ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
|
||||
[AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
|
||||
])# _LT_AC_LANG_GCJ
|
||||
|
||||
|
||||
|
|
@ -2432,7 +2447,7 @@ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
|
|||
# enable support for Windows resource files
|
||||
AC_DEFUN([AC_LIBTOOL_RC],
|
||||
[AC_REQUIRE([LT_AC_PROG_RC])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
|
||||
])# AC_LIBTOOL_RC
|
||||
|
||||
|
||||
|
|
@ -2474,7 +2489,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
|
||||
|
|
@ -2497,9 +2512,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_DLOPEN_SELF($1)
|
||||
|
||||
# Report which librarie types wil actually be built
|
||||
|
|
@ -2526,33 +2541,42 @@ aix4*)
|
|||
fi
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
if test "$GCC" = yes; then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
|
||||
# `"' quotes if we put them in here... so don't!
|
||||
output_verbose_link_cmd='echo'
|
||||
output_verbose_link_cmd='echo'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
fi
|
||||
;;
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$enable_shared])
|
||||
|
||||
|
|
@ -2687,7 +2711,7 @@ if test "$GXX" = yes; then
|
|||
# linker, instead of GNU ld. If possible, this setting should
|
||||
# overridden to take advantage of the native linker features on
|
||||
# the platform it is being used on.
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
fi
|
||||
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
|
|
@ -2854,41 +2878,54 @@ case $host_os in
|
|||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
if test "$GXX" = yes; then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
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
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
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
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
fi
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
|
||||
dgux*)
|
||||
|
|
@ -2915,7 +2952,7 @@ case $host_os in
|
|||
freebsd-elf*)
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
;;
|
||||
freebsd*)
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
|
||||
# conventions
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
|
||||
|
|
@ -3425,9 +3462,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_DLOPEN_SELF($1)
|
||||
|
||||
AC_LIBTOOL_CONFIG($1)
|
||||
|
|
@ -3669,9 +3706,10 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
|
||||
|
||||
AC_LIBTOOL_CONFIG($1)
|
||||
|
||||
|
|
@ -3719,9 +3757,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_DLOPEN_SELF($1)
|
||||
|
||||
AC_LIBTOOL_CONFIG($1)
|
||||
|
|
@ -3786,11 +3824,12 @@ if test -f "$ltmain"; then
|
|||
# without removal of \ escapes.
|
||||
if test -n "${ZSH_VERSION+set}" ; then
|
||||
setopt NO_GLOB_SUBST
|
||||
fi
|
||||
fi
|
||||
# Now quote all the things that may contain metacharacters while being
|
||||
# careful not to overquote the AC_SUBSTed values. We take copies of the
|
||||
# variables and quote the copies for generation of the libtool script.
|
||||
for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
|
||||
for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
|
||||
SED SHELL STRIP \
|
||||
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
|
||||
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
|
||||
deplibs_check_method reload_flag reload_cmds need_locks \
|
||||
|
|
@ -3840,7 +3879,7 @@ if test -f "$ltmain"; then
|
|||
_LT_AC_TAGVAR(archive_cmds, $1) | \
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
|
||||
_LT_AC_TAGVAR(module_cmds, $1) | \
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \
|
||||
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
|
||||
extract_expsyms_cmds | reload_cmds | finish_cmds | \
|
||||
|
|
@ -3971,7 +4010,7 @@ LN_S=$lt_LN_S
|
|||
NM=$lt_NM
|
||||
|
||||
# A symbol stripping program
|
||||
STRIP=$STRIP
|
||||
STRIP=$lt_STRIP
|
||||
|
||||
# Used to examine libraries when file_magic_cmd begins "file"
|
||||
MAGIC_CMD=$MAGIC_CMD
|
||||
|
|
@ -4246,7 +4285,10 @@ else
|
|||
# If there is no Makefile yet, we rely on a make rule to execute
|
||||
# `config.status --recheck' to rerun these tests and create the
|
||||
# libtool script then.
|
||||
test -f Makefile && make "$ltmain"
|
||||
ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
|
||||
if test -f "$ltmain_in"; then
|
||||
test -f Makefile && make "$ltmain"
|
||||
fi
|
||||
fi
|
||||
])# AC_LIBTOOL_CONFIG
|
||||
|
||||
|
|
@ -4319,7 +4361,7 @@ osf*)
|
|||
symcode='[[BCDEGQRST]]'
|
||||
;;
|
||||
solaris* | sysv5*)
|
||||
symcode='[[BDT]]'
|
||||
symcode='[[BDRT]]'
|
||||
;;
|
||||
sysv4)
|
||||
symcode='[[DFNSTU]]'
|
||||
|
|
@ -4337,7 +4379,7 @@ esac
|
|||
# If we're using GNU nm, then use its standard symbol codes.
|
||||
case `$NM -V 2>&1` in
|
||||
*GNU* | *'with BFD'*)
|
||||
symcode='[[ABCDGISTW]]' ;;
|
||||
symcode='[[ABCDGIRSTW]]' ;;
|
||||
esac
|
||||
|
||||
# Try without a prefix undercore, then with it.
|
||||
|
|
@ -4552,7 +4594,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
freebsd*)
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
# FreeBSD uses GNU C++
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
|
|
@ -4603,7 +4645,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
;;
|
||||
;;
|
||||
cxx)
|
||||
# Compaq C++
|
||||
# Make sure the PIC flag is empty. It appears that all Alpha
|
||||
|
|
@ -4828,12 +4870,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
|
||||
linux*)
|
||||
case $CC in
|
||||
icc|ecc)
|
||||
icc* | ecc*)
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
;;
|
||||
ccc)
|
||||
ccc*)
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
# All Alpha code is PIC.
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
||||
|
|
@ -4963,7 +5005,7 @@ ifelse([$1],[CXX],[
|
|||
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
|
||||
_LT_AC_TAGVAR(module_cmds, $1)=
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
|
||||
_LT_AC_TAGVAR(always_export_symbols, $1)=no
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
# include_expsyms should be a list of space-separated symbols to be *always*
|
||||
|
|
@ -5106,6 +5148,31 @@ EOF
|
|||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
|
||||
supports_anon_versioning=no
|
||||
case `$LD -v 2>/dev/null` in
|
||||
*\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
|
||||
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
||||
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
|
||||
*\ 2.11.*) ;; # other 2.11 versions
|
||||
*) supports_anon_versioning=yes ;;
|
||||
esac
|
||||
if test $supports_anon_versioning = yes; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
|
||||
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
||||
$echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
|
||||
fi
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
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'
|
||||
|
|
@ -5294,20 +5361,27 @@ EOF
|
|||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
if test "$GXX" = yes ; then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
|
||||
# `"' quotes if we put them in here... so don't!
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
|
|
@ -5318,20 +5392,22 @@ EOF
|
|||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
fi
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
|
||||
dgux*)
|
||||
|
|
@ -5364,7 +5440,7 @@ EOF
|
|||
;;
|
||||
|
||||
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
||||
freebsd*)
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
|
|
@ -5681,7 +5757,7 @@ x|xyes)
|
|||
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
|
||||
$rm conftest*
|
||||
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
|
||||
|
||||
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
|
||||
soname=conftest
|
||||
lib=conftest
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -55,8 +55,8 @@ modename="$progname"
|
|||
# Constants.
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.5
|
||||
TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
|
||||
VERSION=1.5.2
|
||||
TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
|
|
@ -70,8 +70,8 @@ rm="rm -f"
|
|||
Xsed="${SED}"' -e 1s/^X//'
|
||||
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
|
||||
# test EBCDIC or ASCII
|
||||
case `echo A|od -x` in
|
||||
*[Cc]1*) # EBCDIC based system
|
||||
case `echo A|tr A '\301'` in
|
||||
A) # EBCDIC based system
|
||||
SP2NL="tr '\100' '\n'"
|
||||
NL2SP="tr '\r\n' '\100\100'"
|
||||
;;
|
||||
|
|
@ -94,7 +94,8 @@ if test "${LANG+set}" = set; then
|
|||
fi
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
: ${IFS=" "}
|
||||
: ${IFS="
|
||||
"}
|
||||
|
||||
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
||||
$echo "$modename: not configured to build any kind of library" 1>&2
|
||||
|
|
@ -176,6 +177,7 @@ do
|
|||
;;
|
||||
tag)
|
||||
tagname="$arg"
|
||||
preserve_args="${preserve_args}=$arg"
|
||||
|
||||
# Check whether tagname contains only valid characters
|
||||
case $tagname in
|
||||
|
|
@ -238,6 +240,7 @@ do
|
|||
--debug)
|
||||
$echo "$progname: enabling shell trace mode"
|
||||
set -x
|
||||
preserve_args="$preserve_args $arg"
|
||||
;;
|
||||
|
||||
--dry-run | -n)
|
||||
|
|
@ -268,6 +271,7 @@ do
|
|||
|
||||
--quiet | --silent)
|
||||
show=:
|
||||
preserve_args="$preserve_args $arg"
|
||||
;;
|
||||
|
||||
--tag) prevopt="--tag" prev=tag ;;
|
||||
|
|
@ -275,6 +279,7 @@ do
|
|||
set tag "$optarg" ${1+"$@"}
|
||||
shift
|
||||
prev=tag
|
||||
preserve_args="$preserve_args --tag"
|
||||
;;
|
||||
|
||||
-dlopen)
|
||||
|
|
@ -369,9 +374,11 @@ if test -z "$show_help"; then
|
|||
# Get the compilation command and the source file.
|
||||
base_compile=
|
||||
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
|
||||
suppress_opt=yes
|
||||
suppress_output=
|
||||
arg_mode=normal
|
||||
libobj=
|
||||
later=
|
||||
|
||||
for arg
|
||||
do
|
||||
|
|
@ -400,18 +407,13 @@ if test -z "$show_help"; then
|
|||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
build_old_libs=yes
|
||||
-static | -prefer-pic | -prefer-non-pic)
|
||||
later="$later $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-pic)
|
||||
pic_mode=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-non-pic)
|
||||
pic_mode=no
|
||||
-no-suppress)
|
||||
suppress_opt=no
|
||||
continue
|
||||
;;
|
||||
|
||||
|
|
@ -556,6 +558,25 @@ if test -z "$show_help"; then
|
|||
esac
|
||||
fi
|
||||
|
||||
for arg in $later; do
|
||||
case $arg in
|
||||
-static)
|
||||
build_old_libs=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-pic)
|
||||
pic_mode=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-non-pic)
|
||||
pic_mode=no
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
|
||||
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$obj"; then
|
||||
|
|
@ -722,7 +743,9 @@ pic_object='$objdir/$objname'
|
|||
EOF
|
||||
|
||||
# Allow error messages only from the first compilation.
|
||||
suppress_output=' >/dev/null 2>&1'
|
||||
if test "$suppress_opt" = yes; then
|
||||
suppress_output=' >/dev/null 2>&1'
|
||||
fi
|
||||
else
|
||||
# No PIC object so indicate it doesn't exist in the libtool
|
||||
# object file.
|
||||
|
|
@ -835,7 +858,7 @@ EOF
|
|||
;;
|
||||
esac
|
||||
libtool_args="$nonopt"
|
||||
base_compile="$nonopt"
|
||||
base_compile="$nonopt $@"
|
||||
compile_command="$nonopt"
|
||||
finalize_command="$nonopt"
|
||||
|
||||
|
|
@ -867,6 +890,7 @@ EOF
|
|||
no_install=no
|
||||
objs=
|
||||
non_pic_objects=
|
||||
precious_files_regex=
|
||||
prefer_static_libs=no
|
||||
preload=no
|
||||
prev=
|
||||
|
|
@ -880,6 +904,47 @@ EOF
|
|||
vinfo=
|
||||
vinfo_number=no
|
||||
|
||||
# Infer tagged configuration to use if any are available and
|
||||
# if one wasn't chosen via the "--tag" command line option.
|
||||
# Only attempt this if the compiler in the base link
|
||||
# command doesn't match the default compiler.
|
||||
if test -n "$available_tags" && test -z "$tagname"; then
|
||||
case $base_compile in
|
||||
# Blanks in the command may have been stripped by the calling shell,
|
||||
# but not from the CC environment variable when configure was run.
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||
# Blanks at the start of $base_compile will cause this to fail
|
||||
# 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
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||
# The compiler in $compile_command matches
|
||||
# the one in the tagged configuration.
|
||||
# Assume this is the tagged configuration we want.
|
||||
tagname=$z
|
||||
break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
# If $tagname still isn't set, then no tagged configuration
|
||||
# was found and let the user know that the "--tag" command
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# We need to know -static, to get the right output filenames.
|
||||
for arg
|
||||
do
|
||||
|
|
@ -911,7 +976,6 @@ EOF
|
|||
# Go through the arguments, transforming them on the way.
|
||||
while test "$#" -gt 0; do
|
||||
arg="$1"
|
||||
base_compile="$base_compile $arg"
|
||||
shift
|
||||
case $arg in
|
||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||
|
|
@ -990,6 +1054,11 @@ EOF
|
|||
prev=
|
||||
continue
|
||||
;;
|
||||
precious_regex)
|
||||
precious_files_regex="$arg"
|
||||
prev=
|
||||
continue
|
||||
;;
|
||||
release)
|
||||
release="-$arg"
|
||||
prev=
|
||||
|
|
@ -1287,6 +1356,11 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
|
|
@ -1351,6 +1425,11 @@ EOF
|
|||
|
||||
-o) prev=output ;;
|
||||
|
||||
-precious-files-regex)
|
||||
prev=precious_regex
|
||||
continue
|
||||
;;
|
||||
|
||||
-release)
|
||||
prev=release
|
||||
continue
|
||||
|
|
@ -1619,47 +1698,6 @@ EOF
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Infer tagged configuration to use if any are available and
|
||||
# if one wasn't chosen via the "--tag" command line option.
|
||||
# Only attempt this if the compiler in the base link
|
||||
# command doesn't match the default compiler.
|
||||
if test -n "$available_tags" && test -z "$tagname"; then
|
||||
case $base_compile in
|
||||
# Blanks in the command may have been stripped by the calling shell,
|
||||
# but not from the CC environment variable when configure was run.
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||
# Blanks at the start of $base_compile will cause this to fail
|
||||
# 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
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||
# The compiler in $compile_command matches
|
||||
# the one in the tagged configuration.
|
||||
# Assume this is the tagged configuration we want.
|
||||
tagname=$z
|
||||
break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
# If $tagname still isn't set, then no tagged configuration
|
||||
# was found and let the user know that the "--tag" command
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
|
||||
eval arg=\"$export_dynamic_flag_spec\"
|
||||
compile_command="$compile_command $arg"
|
||||
|
|
@ -1802,6 +1840,15 @@ EOF
|
|||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
else
|
||||
deplibs="$deplib $deplibs"
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
-l*)
|
||||
if test "$linkmode" != lib && test "$linkmode" != prog; then
|
||||
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
|
||||
|
|
@ -1813,12 +1860,18 @@ EOF
|
|||
fi
|
||||
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
||||
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}.la"
|
||||
if test -f "$lib"; then
|
||||
found=yes
|
||||
break
|
||||
fi
|
||||
for search_ext in .la $shrext .so .a; do
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}${search_ext}"
|
||||
if test -f "$lib"; then
|
||||
if test "$search_ext" = ".la"; then
|
||||
found=yes
|
||||
else
|
||||
found=no
|
||||
fi
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
if test "$found" != yes; then
|
||||
# deplib doesn't seem to be a libtool library
|
||||
|
|
@ -2279,9 +2332,10 @@ EOF
|
|||
else
|
||||
$show "extracting exported symbol list from \`$soname'"
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
eval cmds=\"$extract_expsyms_cmds\"
|
||||
cmds=$extract_expsyms_cmds
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -2292,9 +2346,10 @@ EOF
|
|||
if test -f "$output_objdir/$newlib"; then :; else
|
||||
$show "generating import library for \`$soname'"
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
eval cmds=\"$old_archive_from_expsyms_cmds\"
|
||||
cmds=$old_archive_from_expsyms_cmds
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -2352,7 +2407,7 @@ EOF
|
|||
if test -n "$inst_prefix_dir"; then
|
||||
case "$libdir" in
|
||||
[\\/]*)
|
||||
add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
||||
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -2424,7 +2479,7 @@ EOF
|
|||
if test -n "$inst_prefix_dir"; then
|
||||
case "$libdir" in
|
||||
[\\/]*)
|
||||
add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
||||
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -2568,9 +2623,13 @@ EOF
|
|||
if test -f "$path/$depdepl" ; then
|
||||
depdepl="$path/$depdepl"
|
||||
fi
|
||||
newlib_search_path="$newlib_search_path $path"
|
||||
path=""
|
||||
# do not add paths which are already there
|
||||
case " $newlib_search_path " in
|
||||
*" $path "*) ;;
|
||||
*) newlib_search_path="$newlib_search_path $path";;
|
||||
esac
|
||||
fi
|
||||
path=""
|
||||
;;
|
||||
*)
|
||||
path="-L$path"
|
||||
|
|
@ -3038,6 +3097,10 @@ EOF
|
|||
*.$objext)
|
||||
;;
|
||||
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
|
||||
if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
|
||||
then
|
||||
continue
|
||||
fi
|
||||
removelist="$removelist $p"
|
||||
;;
|
||||
*) ;;
|
||||
|
|
@ -3547,10 +3610,11 @@ EOF
|
|||
$show "generating symbol list for \`$libname.la'"
|
||||
export_symbols="$output_objdir/$libname.exp"
|
||||
$run $rm $export_symbols
|
||||
eval cmds=\"$export_symbols_cmds\"
|
||||
cmds=$export_symbols_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
if len=`expr "X$cmd" : ".*"` &&
|
||||
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
||||
$show "$cmd"
|
||||
|
|
@ -3667,19 +3731,23 @@ EOF
|
|||
# Do each of the archive commands.
|
||||
if test "$module" = yes && test -n "$module_cmds" ; then
|
||||
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
|
||||
eval cmds=\"$module_expsym_cmds\"
|
||||
eval test_cmds=\"$module_expsym_cmds\"
|
||||
cmds=$module_expsym_cmds
|
||||
else
|
||||
eval cmds=\"$module_cmds\"
|
||||
eval test_cmds=\"$module_cmds\"
|
||||
cmds=$module_cmds
|
||||
fi
|
||||
else
|
||||
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
||||
eval cmds=\"$archive_expsym_cmds\"
|
||||
eval test_cmds=\"$archive_expsym_cmds\"
|
||||
cmds=$archive_expsym_cmds
|
||||
else
|
||||
eval cmds=\"$archive_cmds\"
|
||||
eval test_cmds=\"$archive_cmds\"
|
||||
cmds=$archive_cmds
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
|
||||
if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
|
||||
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
||||
:
|
||||
else
|
||||
|
|
@ -3764,6 +3832,7 @@ EOF
|
|||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $concat_cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -3780,19 +3849,28 @@ EOF
|
|||
# value of $libobjs for piecewise linking.
|
||||
|
||||
# Do each of the archive commands.
|
||||
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
||||
eval cmds=\"$archive_expsym_cmds\"
|
||||
if test "$module" = yes && test -n "$module_cmds" ; then
|
||||
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
|
||||
cmds=$module_expsym_cmds
|
||||
else
|
||||
cmds=$module_cmds
|
||||
fi
|
||||
else
|
||||
eval cmds=\"$archive_cmds\"
|
||||
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
||||
cmds=$archive_expsym_cmds
|
||||
else
|
||||
cmds=$archive_cmds
|
||||
fi
|
||||
fi
|
||||
|
||||
# Append the command to remove the reloadable object files
|
||||
# to the just-reset $cmds.
|
||||
eval cmds=\"\$cmds~$rm $delfiles\"
|
||||
eval cmds=\"\$cmds~\$rm $delfiles\"
|
||||
fi
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -3943,10 +4021,11 @@ EOF
|
|||
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
|
||||
|
||||
output="$obj"
|
||||
eval cmds=\"$reload_cmds\"
|
||||
cmds=$reload_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -3979,10 +4058,11 @@ EOF
|
|||
# Only do commands if we really have different PIC objects.
|
||||
reload_objs="$libobjs $reload_conv_objs"
|
||||
output="$libobj"
|
||||
eval cmds=\"$reload_cmds\"
|
||||
cmds=$reload_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -4954,13 +5034,13 @@ fi\
|
|||
|
||||
# Do each command in the archive commands.
|
||||
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
|
||||
eval cmds=\"$old_archive_from_new_cmds\"
|
||||
cmds=$old_archive_from_new_cmds
|
||||
else
|
||||
eval cmds=\"$old_archive_cmds\"
|
||||
|
||||
if len=`expr "X$cmds" : ".*"` &&
|
||||
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
||||
:
|
||||
cmds=$old_archive_cmds
|
||||
else
|
||||
# the command line is too long to link in one step, link in parts
|
||||
$echo "using piecewise archive linking..."
|
||||
|
|
@ -5012,12 +5092,13 @@ fi\
|
|||
if test "X$oldobjs" = "X" ; then
|
||||
eval cmds=\"\$concat_cmds\"
|
||||
else
|
||||
eval cmds=\"\$concat_cmds~$old_archive_cmds\"
|
||||
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
eval cmd=\"$cmd\"
|
||||
IFS="$save_ifs"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
|
|
@ -5049,9 +5130,11 @@ fi\
|
|||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
fi
|
||||
# Only create the output if not a dry run.
|
||||
if test -z "$run"; then
|
||||
for installed in no yes; do
|
||||
|
|
@ -5099,6 +5182,25 @@ fi\
|
|||
newdlprefiles="$newdlprefiles $libdir/$name"
|
||||
done
|
||||
dlprefiles="$newdlprefiles"
|
||||
else
|
||||
newdlfiles=
|
||||
for lib in $dlfiles; do
|
||||
case $lib in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
||||
*) abs=`pwd`"/$lib" ;;
|
||||
esac
|
||||
newdlfiles="$newdlfiles $abs"
|
||||
done
|
||||
dlfiles="$newdlfiles"
|
||||
newdlprefiles=
|
||||
for lib in $dlprefiles; do
|
||||
case $lib in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
||||
*) abs=`pwd`"/$lib" ;;
|
||||
esac
|
||||
newdlprefiles="$newdlprefiles $abs"
|
||||
done
|
||||
dlprefiles="$newdlprefiles"
|
||||
fi
|
||||
$rm $output
|
||||
# place dlname in correct position for cygwin
|
||||
|
|
@ -5414,10 +5516,11 @@ relink_command=\"$relink_command\""
|
|||
|
||||
# Do each command in the postinstall commands.
|
||||
lib="$destdir/$realname"
|
||||
eval cmds=\"$postinstall_cmds\"
|
||||
cmds=$postinstall_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -5570,7 +5673,7 @@ relink_command=\"$relink_command\""
|
|||
tmpdir="/tmp"
|
||||
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
||||
tmpdir="$tmpdir/libtool-$$"
|
||||
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
else
|
||||
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
|
||||
continue
|
||||
|
|
@ -5630,16 +5733,17 @@ relink_command=\"$relink_command\""
|
|||
$show "$install_prog $file $oldlib"
|
||||
$run eval "$install_prog \$file \$oldlib" || exit $?
|
||||
|
||||
if test -n "$stripme" && test -n "$striplib"; then
|
||||
if test -n "$stripme" && test -n "$old_striplib"; then
|
||||
$show "$old_striplib $oldlib"
|
||||
$run eval "$old_striplib $oldlib" || exit $?
|
||||
fi
|
||||
|
||||
# Do each command in the postinstall commands.
|
||||
eval cmds=\"$old_postinstall_cmds\"
|
||||
cmds=$old_postinstall_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || exit $?
|
||||
done
|
||||
|
|
@ -5653,7 +5757,7 @@ relink_command=\"$relink_command\""
|
|||
if test -n "$current_libdirs"; then
|
||||
# Maybe just do a dry run.
|
||||
test -n "$run" && current_libdirs=" -n$current_libdirs"
|
||||
exec_cmd='$SHELL $0 --finish$current_libdirs'
|
||||
exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
|
@ -5674,10 +5778,11 @@ relink_command=\"$relink_command\""
|
|||
for libdir in $libdirs; do
|
||||
if test -n "$finish_cmds"; then
|
||||
# Do each command in the finish commands.
|
||||
eval cmds=\"$finish_cmds\"
|
||||
cmds=$finish_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd" || admincmds="$admincmds
|
||||
$cmd"
|
||||
|
|
@ -5951,10 +6056,11 @@ relink_command=\"$relink_command\""
|
|||
if test "$mode" = uninstall; then
|
||||
if test -n "$library_names"; then
|
||||
# Do each command in the postuninstall commands.
|
||||
eval cmds=\"$postuninstall_cmds\"
|
||||
cmds=$postuninstall_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd"
|
||||
if test "$?" -ne 0 && test "$rmforce" != yes; then
|
||||
|
|
@ -5966,10 +6072,11 @@ relink_command=\"$relink_command\""
|
|||
|
||||
if test -n "$old_library"; then
|
||||
# Do each command in the old_postuninstall commands.
|
||||
eval cmds=\"$old_postuninstall_cmds\"
|
||||
cmds=$old_postuninstall_cmds
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
IFS="$save_ifs"
|
||||
eval cmd=\"$cmd\"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd"
|
||||
if test "$?" -ne 0 && test "$rmforce" != yes; then
|
||||
|
|
@ -6214,6 +6321,8 @@ The following components of LINK-COMMAND are treated specially:
|
|||
-no-undefined declare that a library does not refer to external symbols
|
||||
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
|
||||
-objectlist FILE Use a list of object files found in FILE to specify objects
|
||||
-precious-files-regex REGEX
|
||||
don't remove output files matching REGEX
|
||||
-release RELEASE specify package release information
|
||||
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
||||
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
||||
|
|
|
|||
Loading…
Reference in New Issue