mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-23 18:52:09 +01:00
libtool 1.3.3 upgrade
-Yosh
This commit is contained in:
Manish Singh
parent
c40fbfb8c6
commit
fae05831e3
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Fri Jul 16 22:18:36 PDT 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* ltconfig
|
||||
* ltmain.sh: upgrade to libtool 1.3.3
|
||||
|
||||
1999-06-18 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gdate.c, gstrfuncs.c, gstring.c: Fixed the use of the
|
||||
|
||||
170
ltconfig
170
ltconfig
@ -169,8 +169,8 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
|
||||
# Constants:
|
||||
PROGRAM=ltconfig
|
||||
PACKAGE=libtool
|
||||
VERSION=1.3.2
|
||||
TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
|
||||
VERSION=1.3.3
|
||||
TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
|
||||
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
|
||||
rm="rm -f"
|
||||
@ -181,7 +181,8 @@ help="Try \`$progname --help' for more information."
|
||||
default_ofile=libtool
|
||||
can_build_shared=yes
|
||||
enable_shared=yes
|
||||
# All known linkers require a `.a' archive for static linking.
|
||||
# All known linkers require a `.a' archive for static linking (except M$VC,
|
||||
# which needs '.lib').
|
||||
enable_static=yes
|
||||
enable_fast_install=yes
|
||||
enable_dlopen=unknown
|
||||
@ -201,6 +202,7 @@ need_locks=yes
|
||||
ac_ext=c
|
||||
objext=o
|
||||
libext=a
|
||||
exeext=
|
||||
cache_file=
|
||||
|
||||
old_AR="$AR"
|
||||
@ -576,7 +578,7 @@ if test "$with_gcc" != yes || test -z "$CC"; then
|
||||
# Now see if the compiler is really GCC.
|
||||
with_gcc=no
|
||||
echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
|
||||
echo "$progname:579: checking whether we are using GNU C" >&5
|
||||
echo "$progname:581: checking whether we are using GNU C" >&5
|
||||
|
||||
$rm conftest.c
|
||||
cat > conftest.c <<EOF
|
||||
@ -584,7 +586,7 @@ if test "$with_gcc" != yes || test -z "$CC"; then
|
||||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
with_gcc=yes
|
||||
fi
|
||||
$rm conftest.c
|
||||
@ -598,8 +600,8 @@ compiler="$2"
|
||||
echo $ac_n "checking for object suffix... $ac_c" 1>&6
|
||||
$rm conftest*
|
||||
echo 'int i = 1;' > conftest.c
|
||||
echo "$progname:601: checking for object suffix" >& 5
|
||||
if { (eval echo $progname:602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
|
||||
echo "$progname:603: checking for object suffix" >& 5
|
||||
if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
|
||||
# Append any warnings to the config.log.
|
||||
cat conftest.err 1>&5
|
||||
|
||||
@ -617,6 +619,38 @@ fi
|
||||
$rm conftest*
|
||||
echo "$ac_t$objext" 1>&6
|
||||
|
||||
echo $ac_n "checking for executable suffix... $ac_c" 1>&6
|
||||
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_cv_exeext="no"
|
||||
$rm conftest*
|
||||
echo 'main () { return 0; }' > conftest.c
|
||||
echo "$progname:629: checking for executable suffix" >& 5
|
||||
if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
|
||||
# Append any warnings to the config.log.
|
||||
cat conftest.err 1>&5
|
||||
|
||||
for ac_file in conftest.*; do
|
||||
case $ac_file in
|
||||
*.c | *.err | *.$objext ) ;;
|
||||
*) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
|
||||
esac
|
||||
done
|
||||
else
|
||||
cat conftest.err 1>&5
|
||||
echo "$progname: failed program was:" >&5
|
||||
cat conftest.c >&5
|
||||
fi
|
||||
$rm conftest*
|
||||
fi
|
||||
if test "X$ac_cv_exeext" = Xno; then
|
||||
exeext=""
|
||||
else
|
||||
exeext="$ac_cv_exeext"
|
||||
fi
|
||||
echo "$ac_t$ac_cv_exeext" 1>&6
|
||||
|
||||
echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
|
||||
pic_flag=
|
||||
special_shlib_compile_flags=
|
||||
@ -739,8 +773,8 @@ if test -n "$pic_flag"; then
|
||||
echo "int some_variable = 0;" > conftest.c
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $pic_flag -DPIC"
|
||||
echo "$progname:742: checking if $compiler PIC flag $pic_flag works" >&5
|
||||
if { (eval echo $progname:743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
|
||||
echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
|
||||
if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
|
||||
# Append any warnings to the config.log.
|
||||
cat conftest.err 1>&5
|
||||
|
||||
@ -792,8 +826,8 @@ mkdir out
|
||||
chmod -w .
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.o"
|
||||
echo "$progname:795: checking if $compiler supports -c -o file.o" >&5
|
||||
if { (eval echo $progname:796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
|
||||
echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
|
||||
if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
|
||||
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -825,8 +859,8 @@ if test x"$compiler_c_o" = x"yes"; then
|
||||
echo "int some_variable = 0;" > conftest.c
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -c -o conftest.lo"
|
||||
echo "$progname:828: checking if $compiler supports -c -o file.lo" >&5
|
||||
if { (eval echo $progname:829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
|
||||
echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
|
||||
if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
|
||||
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -877,8 +911,8 @@ if test "$with_gcc" = yes; then
|
||||
echo "int some_variable = 0;" > conftest.c
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
|
||||
echo "$progname:880: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
||||
if { (eval echo $progname:881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
|
||||
echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
||||
if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
|
||||
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -921,8 +955,8 @@ $rm conftest*
|
||||
echo 'main(){return(0);}' > conftest.c
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS $link_static_flag"
|
||||
echo "$progname:924: checking if $compiler static flag $link_static_flag works" >&5
|
||||
if { (eval echo $progname:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
|
||||
if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
echo "$ac_t$link_static_flag" 1>&6
|
||||
else
|
||||
echo "$ac_t"none 1>&6
|
||||
@ -954,7 +988,7 @@ if test -z "$LD"; then
|
||||
if test "$with_gcc" = yes; then
|
||||
# Check if gcc -print-prog-name=ld gives a path.
|
||||
echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
|
||||
echo "$progname:957: checking for ld used by GCC" >&5
|
||||
echo "$progname:991: checking for ld used by GCC" >&5
|
||||
ac_prog=`($CC -print-prog-name=ld) 2>&5`
|
||||
case "$ac_prog" in
|
||||
# Accept absolute paths.
|
||||
@ -978,10 +1012,10 @@ if test -z "$LD"; then
|
||||
esac
|
||||
elif test "$with_gnu_ld" = yes; then
|
||||
echo $ac_n "checking for GNU ld... $ac_c" 1>&6
|
||||
echo "$progname:981: checking for GNU ld" >&5
|
||||
echo "$progname:1015: checking for GNU ld" >&5
|
||||
else
|
||||
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
|
||||
echo "$progname:984: checking for non-GNU ld" >&5
|
||||
echo "$progname:1018: checking for non-GNU ld" >&5
|
||||
fi
|
||||
|
||||
if test -z "$LD"; then
|
||||
@ -1047,7 +1081,7 @@ hardcode_minus_L=no
|
||||
hardcode_shlibpath_var=unsupported
|
||||
runpath_var=
|
||||
always_export_symbols=no
|
||||
export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
export_symbols_cmds='$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*
|
||||
# included in the symbol list
|
||||
include_expsyms=
|
||||
@ -1130,10 +1164,9 @@ EOF
|
||||
# Extract the symbol export list from an `--export-all' def file,
|
||||
# then regenerate the def file from the symbol export list, so that
|
||||
# the compiled dll only exports the symbol export list.
|
||||
export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~
|
||||
sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
|
||||
(cd $objdir && $CC -c $soname-ltdll.c)~
|
||||
$DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs~
|
||||
export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
|
||||
test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
|
||||
$DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~
|
||||
sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols'
|
||||
|
||||
archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
|
||||
@ -1142,13 +1175,15 @@ EOF
|
||||
echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
|
||||
_lt_hint=`expr 1 + \$_lt_hint`;
|
||||
done~
|
||||
test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
|
||||
test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
|
||||
$CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
|
||||
$CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
|
||||
$CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
|
||||
|
||||
old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
|
||||
old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
@ -1554,11 +1589,11 @@ void nm_test_func(){}
|
||||
main(){nm_test_var='a';nm_test_func();return(0);}
|
||||
EOF
|
||||
|
||||
echo "$progname:1557: checking if global_symbol_pipe works" >&5
|
||||
if { (eval echo $progname:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
|
||||
echo "$progname:1592: checking if global_symbol_pipe works" >&5
|
||||
if { (eval echo $progname:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
|
||||
# Now try to grab the symbols.
|
||||
nlist=conftest.nm
|
||||
if { echo "$progname:1561: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
|
||||
if { echo "$progname:1596: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
|
||||
|
||||
# Try sorting and uniquifying the output.
|
||||
if sort "$nlist" | uniq > "$nlist"T; then
|
||||
@ -1610,7 +1645,7 @@ EOF
|
||||
save_CFLAGS="$CFLAGS"
|
||||
LIBS="conftstm.$objext"
|
||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||
if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo $progname:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
pipe_works=yes
|
||||
else
|
||||
echo "$progname: failed program was:" >&5
|
||||
@ -1756,7 +1791,7 @@ bsdi4*)
|
||||
soname_spec='${libname}.so'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
deplibs_check_method='file_magic ELF 32-bit LSB shared object'
|
||||
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
|
||||
file_magic_cmd=/usr/bin/file
|
||||
file_magic_test_file=/shlib/libc.so
|
||||
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
||||
@ -1768,6 +1803,8 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw*)
|
||||
version_type=windows
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
if test "$with_gcc" = yes; then
|
||||
library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
|
||||
else
|
||||
@ -1776,7 +1813,6 @@ cygwin* | mingw*)
|
||||
dynamic_linker='Win32 ld.exe'
|
||||
deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
file_magic_cmd='${OBJDUMP} -f'
|
||||
need_lib_prefix=no
|
||||
# FIXME: first we should search . and the directory the executable is in
|
||||
shlibpath_var=PATH
|
||||
lt_cv_dlopen="LoadLibrary"
|
||||
@ -1807,11 +1843,22 @@ freebsd*)
|
||||
esac
|
||||
finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
case "$host_os" in
|
||||
freebsd2* | freebsd3.[01]*)
|
||||
shlibpath_overrides_runpath=yes
|
||||
;;
|
||||
*) # from 3.2 on
|
||||
shlibpath_overrides_runpath=no
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
gnu*)
|
||||
version_type=linux
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
|
||||
soname_spec='${libname}${release}.so$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
;;
|
||||
|
||||
@ -2120,7 +2167,7 @@ else
|
||||
if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
|
||||
lt_cv_dlopen=no lt_cv_dlopen_libs=
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "$progname:2123: checking for dlopen in -ldl" >&5
|
||||
echo "$progname:2170: checking for dlopen in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2128,7 +2175,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2131 "ltconfig"
|
||||
#line 2178 "ltconfig"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
@ -2138,7 +2185,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2157,12 +2204,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "$progname:2160: checking for dlopen" >&5
|
||||
echo "$progname:2207: checking for dlopen" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2165 "ltconfig"
|
||||
#line 2212 "ltconfig"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
#include <assert.h>
|
||||
@ -2184,7 +2231,7 @@ dlopen();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_dlopen=yes"
|
||||
else
|
||||
@ -2201,7 +2248,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
|
||||
echo "$progname:2204: checking for dld_link in -ldld" >&5
|
||||
echo "$progname:2251: checking for dld_link in -ldld" >&5
|
||||
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2209,7 +2256,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2212 "ltconfig"
|
||||
#line 2259 "ltconfig"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
@ -2219,7 +2266,7 @@ int main() {
|
||||
dld_link()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2238,12 +2285,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
|
||||
echo "$progname:2241: checking for shl_load" >&5
|
||||
echo "$progname:2288: checking for shl_load" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2246 "ltconfig"
|
||||
#line 2293 "ltconfig"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shl_load(); below. */
|
||||
#include <assert.h>
|
||||
@ -2265,7 +2312,7 @@ shl_load();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_shl_load=yes"
|
||||
else
|
||||
@ -2283,7 +2330,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
|
||||
echo "$progname:2286: checking for shl_load in -ldld" >&5
|
||||
echo "$progname:2333: checking for shl_load in -ldld" >&5
|
||||
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2291,7 +2338,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2294 "ltconfig"
|
||||
#line 2341 "ltconfig"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -2302,7 +2349,7 @@ int main() {
|
||||
shl_load()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2345,17 +2392,17 @@ fi
|
||||
for ac_hdr in dlfcn.h; do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "$progname:2348: checking for $ac_hdr" >&5
|
||||
echo "$progname:2395: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2353 "ltconfig"
|
||||
#line 2400 "ltconfig"
|
||||
#include <$ac_hdr>
|
||||
int fnord = 0;
|
||||
EOF
|
||||
ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo $progname:2358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo $progname:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -2383,7 +2430,7 @@ done
|
||||
LIBS="$lt_cv_dlopen_libs $LIBS"
|
||||
|
||||
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
|
||||
echo "$progname:2386: checking whether a program can dlopen itself" >&5
|
||||
echo "$progname:2433: checking whether a program can dlopen itself" >&5
|
||||
if test "${lt_cv_dlopen_self+set}" = set; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -2391,7 +2438,7 @@ else
|
||||
lt_cv_dlopen_self=cross
|
||||
else
|
||||
cat > conftest.c <<EOF
|
||||
#line 2394 "ltconfig"
|
||||
#line 2441 "ltconfig"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
@ -2434,10 +2481,10 @@ else
|
||||
fnord() { int i=42;}
|
||||
main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
|
||||
if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
|
||||
if(ptr1 || ptr2) exit(0); } exit(1); }
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
lt_cv_dlopen_self=yes
|
||||
else
|
||||
@ -2456,7 +2503,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
|
||||
if test "$lt_cv_dlopen_self" = yes; then
|
||||
LDFLAGS="$LDFLAGS $link_static_flag"
|
||||
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
|
||||
echo "$progname:2459: checking whether a statically linked program can dlopen itself" >&5
|
||||
echo "$progname:2506: checking whether a statically linked program can dlopen itself" >&5
|
||||
if test "${lt_cv_dlopen_self_static+set}" = set; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -2464,7 +2511,7 @@ else
|
||||
lt_cv_dlopen_self_static=cross
|
||||
else
|
||||
cat > conftest.c <<EOF
|
||||
#line 2467 "ltconfig"
|
||||
#line 2514 "ltconfig"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
@ -2507,10 +2554,10 @@ else
|
||||
fnord() { int i=42;}
|
||||
main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
|
||||
if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
|
||||
if(ptr1 || ptr2) exit(0); } exit(1); }
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
lt_cv_dlopen_self_static=yes
|
||||
else
|
||||
@ -2729,6 +2776,9 @@ objext="$objext"
|
||||
# Old archive suffix (normally "a").
|
||||
libext="$libext"
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
|
||||
# Additional compiler flags for building library objects.
|
||||
pic_flag=$pic_flag
|
||||
|
||||
@ -2897,7 +2947,7 @@ EOF
|
||||
esac
|
||||
|
||||
# Append the ltmain.sh script.
|
||||
cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
|
||||
sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
|
||||
|
||||
chmod +x "$ofile"
|
||||
;;
|
||||
|
||||
209
ltmain.sh
209
ltmain.sh
@ -54,8 +54,8 @@ modename="$progname"
|
||||
# Constants.
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.3.2
|
||||
TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
|
||||
VERSION=1.3.3
|
||||
TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
@ -69,7 +69,7 @@ rm="rm -f"
|
||||
Xsed='sed -e 1s/^X//'
|
||||
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
|
||||
SP2NL='tr \040 \012'
|
||||
NL2SP='tr \012 \040'
|
||||
NL2SP='tr \015\012 \040\040'
|
||||
|
||||
# NLS nuisances.
|
||||
# Only set LANG and LC_ALL to C if already set.
|
||||
@ -638,6 +638,12 @@ compiler."
|
||||
# #undef WIN32_LEAN_AND_MEAN
|
||||
# #include <stdio.h>
|
||||
#
|
||||
# #ifndef __CYGWIN__
|
||||
# # ifdef __CYGWIN32__
|
||||
# # define __CYGWIN__ __CYGWIN32__
|
||||
# # endif
|
||||
# #endif
|
||||
#
|
||||
# #ifdef __cplusplus
|
||||
# extern "C" {
|
||||
# #endif
|
||||
@ -646,8 +652,10 @@ compiler."
|
||||
# }
|
||||
# #endif
|
||||
#
|
||||
# #ifdef __CYGWIN__
|
||||
# #include <cygwin/cygwin_dll.h>
|
||||
# DECLARE_CYGWIN_DLL( DllMain );
|
||||
# #endif
|
||||
# HINSTANCE __hDllInstance_base;
|
||||
#
|
||||
# BOOL APIENTRY
|
||||
@ -893,6 +901,14 @@ compiler."
|
||||
fi
|
||||
case "$arg" in
|
||||
*.la | *.lo) ;; # We handle these cases below.
|
||||
force)
|
||||
if test "$dlself" = no; then
|
||||
dlself=needless
|
||||
export_dynamic=yes
|
||||
fi
|
||||
prev=
|
||||
continue
|
||||
;;
|
||||
self)
|
||||
if test "$prev" = dlprefiles; then
|
||||
dlself=yes
|
||||
@ -1222,7 +1238,7 @@ compiler."
|
||||
fi
|
||||
|
||||
if test -n "$dependency_libs"; then
|
||||
# Extract -R from dependency_libs
|
||||
# Extract -R and -L from dependency_libs
|
||||
temp_deplibs=
|
||||
for deplib in $dependency_libs; do
|
||||
case "$deplib" in
|
||||
@ -1234,7 +1250,13 @@ compiler."
|
||||
-L*) case "$compile_command $temp_deplibs " in
|
||||
*" $deplib "*) ;;
|
||||
*) temp_deplibs="$temp_deplibs $deplib";;
|
||||
esac;;
|
||||
esac
|
||||
temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
|
||||
case " $lib_search_path " in
|
||||
*" $temp_dir "*) ;;
|
||||
*) lib_search_path="$lib_search_path $temp_dir";;
|
||||
esac
|
||||
;;
|
||||
*) temp_deplibs="$temp_deplibs $deplib";;
|
||||
esac
|
||||
done
|
||||
@ -2037,51 +2059,6 @@ EOF
|
||||
# Use standard objects if they are pic
|
||||
test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
||||
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
if test -n "$convenience"; then
|
||||
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
|
||||
fi
|
||||
else
|
||||
gentop="$output_objdir/${outputname}x"
|
||||
$show "${rm}r $gentop"
|
||||
$run ${rm}r "$gentop"
|
||||
$show "mkdir $gentop"
|
||||
$run mkdir "$gentop"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$gentop"; then
|
||||
exit $status
|
||||
fi
|
||||
generated="$generated $gentop"
|
||||
|
||||
for xlib in $convenience; do
|
||||
# Extract the objects.
|
||||
case "$xlib" in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
|
||||
*) xabs=`pwd`"/$xlib" ;;
|
||||
esac
|
||||
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
|
||||
xdir="$gentop/$xlib"
|
||||
|
||||
$show "${rm}r $xdir"
|
||||
$run ${rm}r "$xdir"
|
||||
$show "mkdir $xdir"
|
||||
$run mkdir "$xdir"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$xdir"; then
|
||||
exit $status
|
||||
fi
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
|
||||
|
||||
libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
|
||||
done
|
||||
fi
|
||||
|
||||
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
|
||||
eval flag=\"$thread_safe_flag_spec\"
|
||||
linkopts="$linkopts $flag"
|
||||
fi
|
||||
|
||||
# Prepare the list of exported symbols
|
||||
if test -z "$export_symbols"; then
|
||||
if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
|
||||
@ -2109,6 +2086,51 @@ EOF
|
||||
$run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
|
||||
fi
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
|
||||
else
|
||||
gentop="$output_objdir/${outputname}x"
|
||||
$show "${rm}r $gentop"
|
||||
$run ${rm}r "$gentop"
|
||||
$show "mkdir $gentop"
|
||||
$run mkdir "$gentop"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$gentop"; then
|
||||
exit $status
|
||||
fi
|
||||
generated="$generated $gentop"
|
||||
|
||||
for xlib in $convenience; do
|
||||
# Extract the objects.
|
||||
case "$xlib" in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
|
||||
*) xabs=`pwd`"/$xlib" ;;
|
||||
esac
|
||||
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
|
||||
xdir="$gentop/$xlib"
|
||||
|
||||
$show "${rm}r $xdir"
|
||||
$run ${rm}r "$xdir"
|
||||
$show "mkdir $xdir"
|
||||
$run mkdir "$xdir"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$xdir"; then
|
||||
exit $status
|
||||
fi
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
|
||||
|
||||
libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
|
||||
eval flag=\"$thread_safe_flag_spec\"
|
||||
linkopts="$linkopts $flag"
|
||||
fi
|
||||
|
||||
# Do each of the archive commands.
|
||||
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
||||
eval cmds=\"$archive_expsym_cmds\"
|
||||
@ -2187,8 +2209,58 @@ EOF
|
||||
# Delete the old objects.
|
||||
$run $rm $obj $libobj
|
||||
|
||||
# Objects from convenience libraries. This assumes
|
||||
# single-version convenience libraries. Whenever we create
|
||||
# different ones for PIC/non-PIC, this we'll have to duplicate
|
||||
# the extraction.
|
||||
reload_conv_objs=
|
||||
gentop=
|
||||
# reload_cmds runs $LD directly, so let us get rid of
|
||||
# -Wl from whole_archive_flag_spec
|
||||
wl=
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
||||
else
|
||||
gentop="$output_objdir/${obj}x"
|
||||
$show "${rm}r $gentop"
|
||||
$run ${rm}r "$gentop"
|
||||
$show "mkdir $gentop"
|
||||
$run mkdir "$gentop"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$gentop"; then
|
||||
exit $status
|
||||
fi
|
||||
generated="$generated $gentop"
|
||||
|
||||
for xlib in $convenience; do
|
||||
# Extract the objects.
|
||||
case "$xlib" in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
|
||||
*) xabs=`pwd`"/$xlib" ;;
|
||||
esac
|
||||
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
|
||||
xdir="$gentop/$xlib"
|
||||
|
||||
$show "${rm}r $xdir"
|
||||
$run ${rm}r "$xdir"
|
||||
$show "mkdir $xdir"
|
||||
$run mkdir "$xdir"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$xdir"; then
|
||||
exit $status
|
||||
fi
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
|
||||
|
||||
reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# Create the old-style object.
|
||||
reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
|
||||
reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
|
||||
|
||||
output="$obj"
|
||||
eval cmds=\"$reload_cmds\"
|
||||
@ -2201,9 +2273,21 @@ EOF
|
||||
IFS="$save_ifs"
|
||||
|
||||
# Exit if we aren't doing a library object file.
|
||||
test -z "$libobj" && exit 0
|
||||
if test -z "$libobj"; then
|
||||
if test -n "$gentop"; then
|
||||
$show "${rm}r $gentop"
|
||||
$run ${rm}r $gentop
|
||||
fi
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test "$build_libtool_libs" != yes; then
|
||||
if test -n "$gentop"; then
|
||||
$show "${rm}r $gentop"
|
||||
$run ${rm}r $gentop
|
||||
fi
|
||||
|
||||
# Create an invalid libtool object if no PIC, so that we don't
|
||||
# accidentally link it into a program.
|
||||
$show "echo timestamp > $libobj"
|
||||
@ -2213,7 +2297,7 @@ EOF
|
||||
|
||||
if test -n "$pic_flag"; then
|
||||
# Only do commands if we really have different PIC objects.
|
||||
reload_objs="$libobjs"
|
||||
reload_objs="$libobjs $reload_conv_objs"
|
||||
output="$libobj"
|
||||
eval cmds=\"$reload_cmds\"
|
||||
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
|
||||
@ -2231,6 +2315,11 @@ EOF
|
||||
$run $LN_S $obj $libobj || exit $?
|
||||
fi
|
||||
|
||||
if test -n "$gentop"; then
|
||||
$show "${rm}r $gentop"
|
||||
$run ${rm}r $gentop
|
||||
fi
|
||||
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@ -2363,7 +2452,7 @@ EOF
|
||||
fi
|
||||
|
||||
dlsyms=
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" = yes; then
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
if test -n "$NM" && test -n "$global_symbol_pipe"; then
|
||||
dlsyms="${outputname}S.c"
|
||||
else
|
||||
@ -2776,7 +2865,7 @@ else
|
||||
fi"
|
||||
else
|
||||
echo >> $output "\
|
||||
program='$outputname'
|
||||
program='$outputname$exeext'
|
||||
progdir=\"\$thisdir/$objdir\"
|
||||
"
|
||||
fi
|
||||
@ -3201,13 +3290,11 @@ libdir='$install_libdir'\
|
||||
# Install the shared library and build the symlinks.
|
||||
$show "$install_prog $dir/$realname $destdir/$realname"
|
||||
$run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
|
||||
test "X$dlname" = "X$realname" && dlname=
|
||||
|
||||
if test $# -gt 0; then
|
||||
# Delete the old symlinks, and create new ones.
|
||||
for linkname
|
||||
do
|
||||
test "X$dlname" = "X$linkname" && dlname=
|
||||
if test "$linkname" != "$realname"; then
|
||||
$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
|
||||
$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
|
||||
@ -3215,12 +3302,6 @@ libdir='$install_libdir'\
|
||||
done
|
||||
fi
|
||||
|
||||
if test -n "$dlname"; then
|
||||
# Install the dynamically-loadable library.
|
||||
$show "$install_prog $dir/$dlname $destdir/$dlname"
|
||||
$run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
|
||||
fi
|
||||
|
||||
# Do each command in the postinstall commands.
|
||||
lib="$destdir/$realname"
|
||||
eval cmds=\"$postinstall_cmds\"
|
||||
@ -3652,9 +3733,7 @@ libdir='$install_libdir'\
|
||||
# Delete the libtool libraries and symlinks.
|
||||
for n in $library_names; do
|
||||
rmfiles="$rmfiles $dir/$n"
|
||||
test "X$n" = "X$dlname" && dlname=
|
||||
done
|
||||
test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
|
||||
test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
|
||||
|
||||
$show "$rm $rmfiles"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user