mirror of
https://github.com/gcc-mirror/gcc.git
synced 2024-11-21 13:40:47 +00:00
ltconfig, [...]: Upgraded to libtool 1.4a 1.641.2.226.
* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh, ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.226. From-SVN: r41299
This commit is contained in:
Alexandre Oliva
Alexandre Oliva
parent
52c2897732
commit
75b9074c18
@ -1,3 +1,8 @@
|
||||
2001-04-12 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh,
|
||||
ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.226.
|
||||
|
||||
2001-04-11 Stan Shebs <shebs@apple.com>
|
||||
|
||||
* MAINTAINERS: Add self as Darwin port maintainer.
|
||||
|
||||
17
libtool.m4
vendored
17
libtool.m4
vendored
@ -536,8 +536,15 @@ cygwin* | mingw* |pw32*)
|
||||
|
||||
darwin* | rhapsody*)
|
||||
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
|
||||
lt_cv_file_magic_cmd=/usr/bin/file
|
||||
lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
|
||||
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
|
||||
;;
|
||||
|
||||
freebsd* )
|
||||
@ -601,12 +608,10 @@ linux-gnu*)
|
||||
|
||||
netbsd*)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
[lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library']
|
||||
[lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
|
||||
else
|
||||
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
|
||||
[lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
|
||||
fi
|
||||
lt_cv_file_magic_cmd='/usr/bin/file -L'
|
||||
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
|
||||
;;
|
||||
|
||||
newsos6)
|
||||
|
||||
60
ltcf-c.sh
60
ltcf-c.sh
@ -108,7 +108,7 @@ EOF
|
||||
test -f $output_objdir/impgen.exe || (cd $output_objdir && \
|
||||
if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
|
||||
else $CC -o impgen impgen.c ; fi)~
|
||||
$output_objdir/impgen $dir/$soname > $output_objdir/$soname-def'
|
||||
$output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
|
||||
|
||||
old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
|
||||
|
||||
@ -166,23 +166,21 @@ EOF
|
||||
done;
|
||||
fi~
|
||||
'"$ltdll_cmds"'
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
|
||||
$CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags'
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
|
||||
$CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
|
||||
;;
|
||||
|
||||
darwin*|rhapsody*)
|
||||
allow_undefined_flag='-undefined warning'
|
||||
archive_cmds='$CC $(if test "$module" = "yes"; then echo -bundle; else
|
||||
echo -dynamiclib; fi) -o $lib $libobjs $deplibs $linkopts'
|
||||
archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
|
||||
## What we need is to hardcode the path to the library, not the search path
|
||||
#hardcode_direct=yes
|
||||
#hardcode_libdir_flag_spec='-install_name $libdir/$lib'
|
||||
darwin* | rhapsody*)
|
||||
allow_undefined_flag='-undefined suppress'
|
||||
archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
|
||||
# We need to add '_' to the symbols in $export_symbols first
|
||||
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
whole_archive_flag_spec='-all_load'
|
||||
whole_archive_flag_spec='-all_load $convenience'
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
@ -486,13 +484,16 @@ else
|
||||
if test "$with_gcc" = yes; then
|
||||
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
|
||||
archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
else
|
||||
allow_undefined_flag=' -expect_unresolved \*'
|
||||
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
|
||||
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
|
||||
$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
|
||||
|
||||
# cc supports -rpath directly
|
||||
hardcode_libdir_flag_spec='-rpath $libdir'
|
||||
fi
|
||||
hardcode_libdir_flag_spec='-rpath $libdir'
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
|
||||
@ -504,7 +505,7 @@ else
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
no_undefined_flag=' -z text'
|
||||
no_undefined_flag=' -z defs'
|
||||
# $CC -shared without GNU ld will not create a library from C++
|
||||
# object files and a static libstdc++, better avoid it by now
|
||||
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
@ -612,9 +613,6 @@ else
|
||||
ac_cv_prog_cc_static='-static'
|
||||
|
||||
case $host_os in
|
||||
beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
aix*)
|
||||
# All AIX code is PIC.
|
||||
if test "$host_cpu" = ia64; then
|
||||
@ -624,20 +622,28 @@ else
|
||||
lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
|
||||
fi
|
||||
;;
|
||||
*djgpp*)
|
||||
# DJGPP does not support shared libraries at all
|
||||
ac_cv_prog_cc_pic=
|
||||
amigaos*)
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
cygwin* | mingw* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
ac_cv_prog_cc_pic='-DDLL_EXPORT'
|
||||
;;
|
||||
amigaos*)
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
|
||||
darwin* | rhapsody*)
|
||||
# PIC is the default on this platform
|
||||
# Common symbols not allowed in MH_DYLIB files
|
||||
lt_cv_prog_cc_pic='-fno-common'
|
||||
;;
|
||||
*djgpp*)
|
||||
# DJGPP does not support shared libraries at all
|
||||
ac_cv_prog_cc_pic=
|
||||
;;
|
||||
sysv4*MP*)
|
||||
if test -d /usr/nec; then
|
||||
|
||||
34
ltcf-cxx.sh
34
ltcf-cxx.sh
@ -478,6 +478,10 @@ case $host_os in
|
||||
cxx)
|
||||
allow_undefined_flag=' -expect_unresolved \*'
|
||||
archive_cmds='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
|
||||
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done~
|
||||
echo "-hidden">> $lib.exp~
|
||||
$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
|
||||
$rm $lib.exp'
|
||||
|
||||
hardcode_libdir_flag_spec='-rpath $libdir'
|
||||
hardcode_libdir_separator=:
|
||||
@ -536,7 +540,7 @@ case $host_os in
|
||||
case $cc_basename in
|
||||
CC)
|
||||
# Sun C++ 4.2, 5.x and Centerline C++
|
||||
no_undefined_flag=' -ztext'
|
||||
no_undefined_flag=' -zdefs'
|
||||
archive_cmds='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
||||
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
|
||||
@ -581,6 +585,7 @@ case $host_os in
|
||||
*)
|
||||
# GNU C++ compiler with Solaris linker
|
||||
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
|
||||
no_undefined_flag=' ${wl}-z ${wl}defs'
|
||||
if $CC --version | egrep -v '^2\.7' > /dev/null; then
|
||||
archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
|
||||
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
@ -655,9 +660,6 @@ if test "$with_gcc" = yes; then
|
||||
ac_cv_prog_cc_static='-static'
|
||||
|
||||
case $host_os in
|
||||
beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
aix*)
|
||||
# All AIX code is PIC.
|
||||
if test "$host_cpu" = ia64; then
|
||||
@ -667,20 +669,28 @@ if test "$with_gcc" = yes; then
|
||||
lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
|
||||
fi
|
||||
;;
|
||||
*djgpp*)
|
||||
# DJGPP does not support shared libraries at all
|
||||
ac_cv_prog_cc_pic=
|
||||
amigaos*)
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
cygwin* | mingw* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
ac_cv_prog_cc_pic='-DDLL_EXPORT'
|
||||
;;
|
||||
amigaos*)
|
||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
||||
# like `-m68040'.
|
||||
ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
|
||||
darwin* | rhapsody*)
|
||||
# PIC is the default on this platform
|
||||
# Common symbols not allowed in MH_DYLIB files
|
||||
lt_cv_prog_cc_pic='-fno-common'
|
||||
;;
|
||||
*djgpp*)
|
||||
# DJGPP does not support shared libraries at all
|
||||
ac_cv_prog_cc_pic=
|
||||
;;
|
||||
sysv4*MP*)
|
||||
if test -d /usr/nec; then
|
||||
|
||||
28
ltcf-gcj.sh
28
ltcf-gcj.sh
@ -111,7 +111,7 @@ EOF
|
||||
test -f $output_objdir/impgen.exe || (cd $output_objdir && \
|
||||
if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
|
||||
else $CC -o impgen impgen.c ; fi)~
|
||||
$output_objdir/impgen $dir/$soname > $output_objdir/$soname-def'
|
||||
$output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
|
||||
|
||||
old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
|
||||
|
||||
@ -169,11 +169,11 @@ EOF
|
||||
done;
|
||||
fi~
|
||||
'"$ltdll_cmds"'
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_gcj_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_gcj_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
|
||||
$CC $output_objdir/$soname-exp '$lt_cv_gcj_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags'
|
||||
$CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
|
||||
$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
|
||||
$CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
@ -485,18 +485,22 @@ else
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
no_undefined_flag=' -z text'
|
||||
# $CC -shared without GNU ld will not create a library from C++
|
||||
# object files and a static libstdc++, better avoid it by now
|
||||
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
no_undefined_flag=' ${wl}-z ${wl}defs'
|
||||
archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
|
||||
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
|
||||
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmds="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
|
||||
|
||||
hardcode_libdir_flag_spec='${wl}-R $wl$libdir'
|
||||
hardcode_shlibpath_var=no
|
||||
case $host_os in
|
||||
solaris2.[0-5] | solaris2.[0-5].*) ;;
|
||||
*) # Supported since Solaris 2.6 (maybe 2.5.1?)
|
||||
whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
|
||||
whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
|
||||
esac
|
||||
link_all_deplibs=yes
|
||||
;;
|
||||
|
||||
83
ltconfig
83
ltconfig
@ -182,7 +182,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
|
||||
PROGRAM=ltconfig
|
||||
PACKAGE=libtool
|
||||
VERSION=1.4a
|
||||
TIMESTAMP=" (1.641.2.198 2001/03/20 05:47:28)"
|
||||
TIMESTAMP=" (1.641.2.226 2001/04/12 02:39:36)"
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
rm="rm -f"
|
||||
@ -1068,7 +1068,14 @@ cygwin* | mingw* | pw32*)
|
||||
need_lib_prefix=no
|
||||
case $with_gcc,$host_os in
|
||||
yes,cygwin*)
|
||||
library_names_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
|
||||
library_names_spec='$libname.dll.a'
|
||||
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
|
||||
postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i; echo \$dlname'\''`~
|
||||
dldir=$destdir/`dirname \$dlpath`~
|
||||
test -d \$dldir || mkdir -p \$dldir~
|
||||
$install_prog .libs/$dlname \$dldir/$dlname'
|
||||
postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
|
||||
dlpath=$dir/\$dldll; $rm \$dlpath'
|
||||
;;
|
||||
yes,mingw*)
|
||||
library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
|
||||
@ -1089,10 +1096,12 @@ cygwin* | mingw* | pw32*)
|
||||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
library_names_spec='${libname}.`if test "$module" = "yes"; then echo so; else echo dylib; fi`'
|
||||
dynamic_linker="$host_os dyld"
|
||||
version_type=darwin
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
postinstall_cmds='chmod +x $lib'
|
||||
library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
|
||||
soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
;;
|
||||
@ -1378,7 +1387,7 @@ sysv4)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Handle CRLF in mingw too chain
|
||||
# Handle CRLF in mingw tool chain
|
||||
opt_cr=
|
||||
case $host_os in
|
||||
mingw*)
|
||||
@ -1412,11 +1421,11 @@ void nm_test_func(){}
|
||||
int main(){nm_test_var='a';nm_test_func();return(0);}
|
||||
EOF
|
||||
|
||||
echo "$progname:1414: checking if global_symbol_pipe works" >&5
|
||||
if { (eval echo $progname:1415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
|
||||
echo "$progname:1424: checking if global_symbol_pipe works" >&5
|
||||
if { (eval echo $progname:1425: \"$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:1418: 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:1428: 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
|
||||
@ -1468,7 +1477,7 @@ EOF
|
||||
save_CFLAGS="$CFLAGS"
|
||||
LIBS="conftstm.$objext"
|
||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||
if { (eval echo $progname:1470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo $progname:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
pipe_works=yes
|
||||
else
|
||||
echo "$progname: failed program was:" >&5
|
||||
@ -1572,14 +1581,14 @@ else
|
||||
if test "X${lt_cv_dlopen+set}" != Xset; then
|
||||
lt_cv_dlopen=no lt_cv_dlopen_libs=
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "$progname:1574: checking for dlopen in -ldl" >&5
|
||||
echo "$progname:1584: checking for dlopen in -ldl" >&5
|
||||
if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1581 "ltconfig"
|
||||
#line 1591 "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. */
|
||||
@ -1592,7 +1601,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:1594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_lib_dl_dlopen=yes
|
||||
else
|
||||
@ -1611,12 +1620,12 @@ if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "$progname:1613: checking for dlopen" >&5
|
||||
echo "$progname:1623: checking for dlopen" >&5
|
||||
if test "X${ac_cv_func_dlopen+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1618 "ltconfig"
|
||||
#line 1628 "ltconfig"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
#include <assert.h>
|
||||
@ -1641,7 +1650,7 @@ dlopen();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:1643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_dlopen=yes
|
||||
else
|
||||
@ -1658,14 +1667,14 @@ if test "X$ac_cv_func_dlopen" = Xyes; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
|
||||
echo "$progname:1660: checking for dlopen in -lsvld" >&5
|
||||
echo "$progname:1670: checking for dlopen in -lsvld" >&5
|
||||
if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsvld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1667 "ltconfig"
|
||||
#line 1677 "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. */
|
||||
@ -1678,7 +1687,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_lib_svld_dlopen=yes
|
||||
else
|
||||
@ -1697,14 +1706,14 @@ if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
|
||||
echo "$progname:1699: checking for dld_link in -ldld" >&5
|
||||
echo "$progname:1709: checking for dld_link in -ldld" >&5
|
||||
if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1706 "ltconfig"
|
||||
#line 1716 "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. */
|
||||
@ -1717,7 +1726,7 @@ int main() {
|
||||
dld_link()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_lib_dld_dld_link=yes
|
||||
else
|
||||
@ -1736,12 +1745,12 @@ if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
|
||||
echo "$progname:1738: checking for shl_load" >&5
|
||||
echo "$progname:1748: checking for shl_load" >&5
|
||||
if test "X${ac_cv_func_shl_load+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1743 "ltconfig"
|
||||
#line 1753 "ltconfig"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shl_load(); below. */
|
||||
#include <assert.h>
|
||||
@ -1766,7 +1775,7 @@ shl_load();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_shl_load=yes
|
||||
else
|
||||
@ -1784,14 +1793,14 @@ if test "X$ac_cv_func_shl_load" = Xyes; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
|
||||
echo "$progname:1786: checking for shl_load in -ldld" >&5
|
||||
echo "$progname:1796: checking for shl_load in -ldld" >&5
|
||||
if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1793 "ltconfig"
|
||||
#line 1803 "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
|
||||
@ -1805,7 +1814,7 @@ int main() {
|
||||
shl_load()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_lib_dld_shl_load=yes
|
||||
else
|
||||
@ -1852,18 +1861,18 @@ 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:1854: checking for $ac_hdr" >&5
|
||||
echo "$progname:1864: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1859 "ltconfig"
|
||||
#line 1869 "ltconfig"
|
||||
#include <$ac_hdr>
|
||||
int fnord = 0;
|
||||
int main () { return(0); }
|
||||
EOF
|
||||
ac_try="$ac_compile >/dev/null 2>conftest.out"
|
||||
{ (eval echo $progname:1865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo $progname:1875: \"$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*
|
||||
@ -1891,7 +1900,7 @@ done
|
||||
LIBS="$lt_cv_dlopen_libs $LIBS"
|
||||
|
||||
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
|
||||
echo "$progname:1893: checking whether a program can dlopen itself" >&5
|
||||
echo "$progname:1903: checking whether a program can dlopen itself" >&5
|
||||
if test "X${lt_cv_dlopen_self+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -1899,7 +1908,7 @@ else
|
||||
lt_cv_dlopen_self=cross
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1901 "ltconfig"
|
||||
#line 1911 "ltconfig"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
@ -1946,7 +1955,7 @@ int main() {
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo $progname:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
lt_cv_dlopen_self=yes
|
||||
else
|
||||
@ -1965,7 +1974,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:1967: checking whether a statically linked program can dlopen itself" >&5
|
||||
echo "$progname:1977: checking whether a statically linked program can dlopen itself" >&5
|
||||
if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -1973,7 +1982,7 @@ else
|
||||
lt_cv_dlopen_self_static=cross
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1975 "ltconfig"
|
||||
#line 1985 "ltconfig"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
@ -2020,7 +2029,7 @@ int main() {
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo $progname:2032: \"$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
|
||||
@ -2616,7 +2625,7 @@ EOF
|
||||
# filename = argv[1];
|
||||
#
|
||||
# dll = open(filename, O_RDONLY|O_BINARY);
|
||||
# if (!dll)
|
||||
# if (dll < 1)
|
||||
# return 1;
|
||||
#
|
||||
# dll_name = filename;
|
||||
|
||||
251
ltmain.sh
251
ltmain.sh
@ -56,7 +56,7 @@ modename="$progname"
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.4a
|
||||
TIMESTAMP=" (1.641.2.198 2001/03/20 05:47:28)"
|
||||
TIMESTAMP=" (1.641.2.226 2001/04/12 02:39:36)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
@ -136,13 +136,21 @@ do
|
||||
;;
|
||||
esac
|
||||
|
||||
if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
|
||||
taglist="$taglist $tagname"
|
||||
# Evaluate the configuration.
|
||||
eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
|
||||
else
|
||||
echo "$progname: ignoring unknown tag $tagname" 1>&2
|
||||
fi
|
||||
case $tagname in
|
||||
CC)
|
||||
# Don't test for the "default" C tag, as we know, it's there, but
|
||||
# not specially marked.
|
||||
;;
|
||||
*)
|
||||
if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
|
||||
taglist="$taglist $tagname"
|
||||
# Evaluate the configuration.
|
||||
eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
|
||||
else
|
||||
echo "$progname: ignoring unknown tag $tagname" 1>&2
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
eval "$prev=\$arg"
|
||||
@ -1205,9 +1213,10 @@ EOF
|
||||
# These systems don't actually have c library (as such)
|
||||
continue
|
||||
;;
|
||||
*-*-rhapsody* | *-*-darwin*)
|
||||
# Darwin C library is in the System framework
|
||||
*-*-rhapsody* | *-*-darwin1.[012])
|
||||
# Rhapsody C library is in the System framework
|
||||
deplibs="$deplibs -framework System"
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
elif test "$arg" = "-lm"; then
|
||||
@ -1216,9 +1225,10 @@ EOF
|
||||
# These systems don't actually have math library (as such)
|
||||
continue
|
||||
;;
|
||||
*-*-rhapsody* | *-*-darwin*)
|
||||
# Darwin math library is in the System framework
|
||||
*-*-rhapsody* | *-*-darwin1.[012])
|
||||
# Rhapsody math library is in the System framework
|
||||
deplibs="$deplibs -framework System"
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1245,10 +1255,6 @@ EOF
|
||||
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
||||
fast_install=no
|
||||
;;
|
||||
*-*-rhapsody* | *-*-darwin*)
|
||||
# Darwin C library is in the System framework
|
||||
deplibs="$deplibs -framework System"
|
||||
;;
|
||||
*)
|
||||
no_install=yes
|
||||
;;
|
||||
@ -1632,6 +1638,18 @@ EOF
|
||||
|
||||
if test $linkmode = lib; then
|
||||
libs="$predeps $libs $compiler_lib_search_path $postdeps"
|
||||
|
||||
# Compute libraries that are listed more than once in $predeps
|
||||
# $postdeps and mark them as special (i.e., whose duplicates are
|
||||
# not to be eliminated).
|
||||
pre_post_deps=
|
||||
for pre_post_dep in $predeps $postdeps; do
|
||||
case "$pre_post_deps " in
|
||||
*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
|
||||
esac
|
||||
pre_post_deps="$pre_post_deps $pre_post_dep"
|
||||
done
|
||||
pre_post_deps=
|
||||
fi
|
||||
|
||||
deplibs=
|
||||
@ -2081,13 +2099,25 @@ EOF
|
||||
realname="$2"
|
||||
shift; shift
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
if test -n "$soname_spec"; then
|
||||
# use dlname if we got it. it's perfectly good, no?
|
||||
if test -n "$dlname"; then
|
||||
soname="$dlname"
|
||||
elif test -n "$soname_spec"; then
|
||||
# bleh windows
|
||||
case $host in
|
||||
*cygwin*)
|
||||
major=`expr $current - $age`
|
||||
versuffix="-$major"
|
||||
;;
|
||||
esac
|
||||
eval soname=\"$soname_spec\"
|
||||
else
|
||||
soname="$realname"
|
||||
fi
|
||||
|
||||
# Make a new name for the extract_expsyms_cmds to use
|
||||
soroot="$soname"
|
||||
soname=`echo $soroot | sed -e 's/^.*\///'`
|
||||
newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
|
||||
|
||||
# If the library has no export list, then create one now
|
||||
@ -2350,25 +2380,44 @@ EOF
|
||||
vars="compile_deplibs finalize_deplibs"
|
||||
fi
|
||||
for var in $vars dependency_libs; do
|
||||
# Make sure that $var contains only unique libraries
|
||||
# and add them in reverse order
|
||||
# Add libraries to $var in reverse order
|
||||
eval tmp_libs=\"\$$var\"
|
||||
new_libs=
|
||||
for deplib in $tmp_libs; do
|
||||
# FIXME: Pedantically, this is the right thing to do, so
|
||||
# that some nasty dependency loop isn't accidentally
|
||||
# broken:
|
||||
#new_libs="$deplib $new_libs"
|
||||
# Pragmatically, this seems to cause very few problems in
|
||||
# practice:
|
||||
case $deplib in
|
||||
-L*) new_libs="$deplib $new_libs" ;;
|
||||
*)
|
||||
case " $specialdeplibs " in
|
||||
*" $deplib "*) new_libs="$deplib $new_libs" ;;
|
||||
*)
|
||||
case " $new_libs " in
|
||||
*" $deplib "*) ;;
|
||||
*) new_libs="$deplib $new_libs" ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
-L*) new_libs="$deplib $new_libs" ;;
|
||||
*)
|
||||
# And here is the reason: when a library appears more
|
||||
# than once as an explicit dependence of a library, or
|
||||
# is implicitly linked in more than once by the
|
||||
# compiler, it is considered special, and multiple
|
||||
# occurrences thereof are not removed. Compare this
|
||||
# with having the same library being listed as a
|
||||
# dependency of multiple other libraries: in this case,
|
||||
# we know (pedantically, we assume) the library does not
|
||||
# need to be listed more than once, so we keep only the
|
||||
# last copy. This is not always right, but it is rare
|
||||
# enough that we require users that really mean to play
|
||||
# such unportable linking tricks to link the library
|
||||
# using -Wl,-lname, so that libtool does not consider it
|
||||
# for duplicate removal.
|
||||
case " $specialdeplibs " in
|
||||
*" $deplib "*) new_libs="$deplib $new_libs" ;;
|
||||
*)
|
||||
case " $new_libs " in
|
||||
*" $deplib "*) ;;
|
||||
*) new_libs="$deplib $new_libs" ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
tmp_libs=
|
||||
for deplib in $new_libs; do
|
||||
@ -2510,7 +2559,7 @@ EOF
|
||||
|
||||
# Check that each of the things are valid numbers.
|
||||
case $current in
|
||||
0 | [1-9] | [1-9][0-9]*) ;;
|
||||
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
||||
*)
|
||||
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
@ -2519,7 +2568,7 @@ EOF
|
||||
esac
|
||||
|
||||
case $revision in
|
||||
0 | [1-9] | [1-9][0-9]*) ;;
|
||||
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
||||
*)
|
||||
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
@ -2528,7 +2577,7 @@ EOF
|
||||
esac
|
||||
|
||||
case $age in
|
||||
0 | [1-9] | [1-9][0-9]*) ;;
|
||||
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
||||
*)
|
||||
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
@ -2549,6 +2598,26 @@ EOF
|
||||
case $version_type in
|
||||
none) ;;
|
||||
|
||||
darwin)
|
||||
# Like Linux, but with the current version available in
|
||||
# verstring for coding it into the library header
|
||||
major=.`expr $current - $age`
|
||||
versuffix="$major.$age.$revision"
|
||||
# Darwin ld doesn't like 0 for these options...
|
||||
minor_current=`expr $current + 1`
|
||||
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
||||
;;
|
||||
|
||||
freebsd-aout)
|
||||
major=".$current"
|
||||
versuffix=".$current.$revision";
|
||||
;;
|
||||
|
||||
freebsd-elf)
|
||||
major=".$current"
|
||||
versuffix=".$current";
|
||||
;;
|
||||
|
||||
irix)
|
||||
major=`expr $current - $age + 1`
|
||||
verstring="sgi$major.$revision"
|
||||
@ -2593,16 +2662,6 @@ EOF
|
||||
versuffix=".$current.$revision"
|
||||
;;
|
||||
|
||||
freebsd-aout)
|
||||
major=".$current"
|
||||
versuffix=".$current.$revision";
|
||||
;;
|
||||
|
||||
freebsd-elf)
|
||||
major=".$current"
|
||||
versuffix=".$current";
|
||||
;;
|
||||
|
||||
windows)
|
||||
# Use '-' rather than '.', since we only want one
|
||||
# extension on DOS 8.3 filesystems.
|
||||
@ -2725,6 +2784,10 @@ EOF
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
*-*-rhapsody* | *-*-darwin1.[012])
|
||||
# Rhapsody C library is in the System framework
|
||||
deplibs="$deplibs -framework System"
|
||||
;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems if necessary.
|
||||
if test $build_libtool_need_lc = "yes"; then
|
||||
@ -2884,6 +2947,40 @@ EOF
|
||||
fi
|
||||
done # Gone through all deplibs.
|
||||
;;
|
||||
match_pattern*)
|
||||
set dummy $deplibs_check_method
|
||||
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
|
||||
for a_deplib in $deplibs; do
|
||||
name="`expr $a_deplib : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" -a "$name" != "0"; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
||||
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
||||
for potent_lib in $potential_libs; do
|
||||
if eval echo \"$potent_lib\" 2>/dev/null \
|
||||
| sed 10q \
|
||||
| egrep "$match_pattern_regex" > /dev/null; then
|
||||
newdeplibs="$newdeplibs $a_deplib"
|
||||
a_deplib=""
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
if test -n "$a_deplib" ; then
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $a_deplib."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
fi
|
||||
else
|
||||
# Add a -L argument.
|
||||
newdeplibs="$newdeplibs $a_deplib"
|
||||
fi
|
||||
done # Gone through all deplibs.
|
||||
;;
|
||||
none | unknown | *)
|
||||
newdeplibs=""
|
||||
if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
|
||||
@ -3025,6 +3122,9 @@ EOF
|
||||
else
|
||||
soname="$realname"
|
||||
fi
|
||||
if test x$dlname = x; then
|
||||
dlname=$soname
|
||||
fi
|
||||
|
||||
lib="$output_objdir/$realname"
|
||||
for link
|
||||
@ -3434,6 +3534,9 @@ EOF
|
||||
;;
|
||||
|
||||
prog)
|
||||
case $host in
|
||||
*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
|
||||
esac
|
||||
if test -n "$vinfo"; then
|
||||
$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
|
||||
fi
|
||||
@ -3877,6 +3980,11 @@ static const void *lt_preloaded_setup() {
|
||||
case $output in
|
||||
*.exe) output=`echo $output|sed 's,.exe$,,'` ;;
|
||||
esac
|
||||
# test for cygwin because mv fails w/o .exe extensions
|
||||
case $host in
|
||||
*cygwin*) exeext=.exe ;;
|
||||
*) exeext= ;;
|
||||
esac
|
||||
$rm $output
|
||||
trap "$rm $output; exit 1" 1 2 15
|
||||
|
||||
@ -3955,7 +4063,7 @@ else
|
||||
|
||||
if test "$fast_install" = yes; then
|
||||
echo >> $output "\
|
||||
program=lt-'$outputname'
|
||||
program=lt-'$outputname'$exeext
|
||||
progdir=\"\$thisdir/$objdir\"
|
||||
|
||||
if test ! -f \"\$progdir/\$program\" || \\
|
||||
@ -4263,6 +4371,11 @@ fi\
|
||||
dlprefiles="$newdlprefiles"
|
||||
fi
|
||||
$rm $output
|
||||
# place dlname in correct position for cygwin
|
||||
tdlname=$dlname
|
||||
case $host,$output,$installed,$module,$dlname in
|
||||
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
||||
esac
|
||||
$echo > $output "\
|
||||
# $outputname - a libtool library file
|
||||
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
||||
@ -4271,7 +4384,7 @@ fi\
|
||||
# It is necessary for linking the library.
|
||||
|
||||
# The name that we can dlopen(3).
|
||||
dlname='$dlname'
|
||||
dlname='$tdlname'
|
||||
|
||||
# Names of this library.
|
||||
library_names='$library_names'
|
||||
@ -4695,6 +4808,25 @@ relink_command=\"$relink_command\""
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# remove .exe since cygwin /usr/bin/install will append another
|
||||
# one anyways
|
||||
case $install_prog,$host in
|
||||
*/usr/bin/install*,*cygwin*)
|
||||
case $file:$destfile in
|
||||
*.exe:*.exe)
|
||||
# this is ok
|
||||
;;
|
||||
*.exe:*)
|
||||
destfile=$destfile.exe
|
||||
;;
|
||||
*:*.exe)
|
||||
destfile=`echo $destfile | sed -e 's,.exe$,,'`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
$show "$install_prog$stripme $file $destfile"
|
||||
$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
|
||||
test -n "$outputname" && ${rm}r "$tmpdir"
|
||||
@ -4786,7 +4918,7 @@ relink_command=\"$relink_command\""
|
||||
echo
|
||||
echo "If you ever happen to want to link against installed libraries"
|
||||
echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
echo "flag during linking and do at least one of the following:"
|
||||
if test -n "$shlibpath_var"; then
|
||||
echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
@ -4962,6 +5094,8 @@ relink_command=\"$relink_command\""
|
||||
modename="$modename: $mode"
|
||||
rm="$nonopt"
|
||||
files=
|
||||
rmforce=
|
||||
exit_status=0
|
||||
|
||||
# This variable tells wrapper scripts just to set variables rather
|
||||
# than running their programs.
|
||||
@ -4970,6 +5104,7 @@ relink_command=\"$relink_command\""
|
||||
for arg
|
||||
do
|
||||
case $arg in
|
||||
-f) rm="$rm $arg"; rmforce=yes ;;
|
||||
-*) rm="$rm $arg" ;;
|
||||
*) files="$files $arg" ;;
|
||||
esac
|
||||
@ -5001,6 +5136,16 @@ relink_command=\"$relink_command\""
|
||||
*) rmdirs="$rmdirs $objdir" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Don't error if the file doesn't exist and rm -f was used.
|
||||
if test -L "$file" >/dev/null 2>&1 || test -f "$file"; then
|
||||
:
|
||||
elif test -d "$file"; then
|
||||
exit_status=1
|
||||
continue
|
||||
elif test "$rmforce" = yes; then
|
||||
continue
|
||||
fi
|
||||
|
||||
rmfiles="$file"
|
||||
|
||||
@ -5026,6 +5171,9 @@ relink_command=\"$relink_command\""
|
||||
IFS="$save_ifs"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd"
|
||||
if test $? != 0 && test "$rmforce" != yes; then
|
||||
exit_status=1
|
||||
fi
|
||||
done
|
||||
IFS="$save_ifs"
|
||||
fi
|
||||
@ -5038,6 +5186,9 @@ relink_command=\"$relink_command\""
|
||||
IFS="$save_ifs"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd"
|
||||
if test $? != 0 && test "$rmforce" != yes; then
|
||||
exit_status=1
|
||||
fi
|
||||
done
|
||||
IFS="$save_ifs"
|
||||
fi
|
||||
@ -5082,7 +5233,7 @@ relink_command=\"$relink_command\""
|
||||
;;
|
||||
esac
|
||||
$show "$rm $rmfiles"
|
||||
$run $rm $rmfiles
|
||||
$run $rm $rmfiles || exit_status=1
|
||||
done
|
||||
|
||||
# Try to remove the ${objdir}s in the directories where we deleted files
|
||||
@ -5093,7 +5244,7 @@ relink_command=\"$relink_command\""
|
||||
fi
|
||||
done
|
||||
|
||||
exit 0
|
||||
exit $exit_status
|
||||
;;
|
||||
|
||||
"")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user