mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-02-17 15:10:02 +08:00
* m4/libtool.m4, ltmain.in: Rename shrext to shrext_cmds.
This commit is contained in:
Peter O'Gorman
parent
0964364db2
commit
62e21425d6
@ -1,3 +1,7 @@
|
||||
2004-02-15 Peter O'Gorman <peter@pogma.com>
|
||||
|
||||
* m4/libtool.m4, ltmain.in: Rename shrext to shrext_cmds.
|
||||
|
||||
2004-02-13 Scott James Remnant <scott@netsplit.com>
|
||||
|
||||
* ltmain.in, libtoolize.in, commit, config/mailnotify: Correctly
|
||||
|
||||
17
ltmain.in
17
ltmain.in
@ -299,6 +299,9 @@ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Darwin sucks
|
||||
eval std_shrext=\"$shrext_cmds\"
|
||||
|
||||
# Parse our command line options once, thoroughly.
|
||||
while test "$#" -gt 0
|
||||
do
|
||||
@ -1278,6 +1281,11 @@ EOF
|
||||
prev=
|
||||
continue
|
||||
;;
|
||||
shrext)
|
||||
shrext_cmds="$arg"
|
||||
prev=
|
||||
continue
|
||||
;;
|
||||
*)
|
||||
eval "$prev=\"\$arg\""
|
||||
prev=
|
||||
@ -1928,8 +1936,7 @@ 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
|
||||
eval shared_ext=\"$shrext\"
|
||||
for search_ext in .la $shared_ext .so .a; do
|
||||
for search_ext in .la $std_shrext .so .a; do
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}${search_ext}"
|
||||
if test -f "$lib"; then
|
||||
@ -2920,7 +2927,7 @@ EOF
|
||||
case $outputname in
|
||||
lib*)
|
||||
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
eval shared_ext=\"$shrext\"
|
||||
eval shared_ext=\"$shrext_cmds\"
|
||||
eval libname=\"$libname_spec\"
|
||||
;;
|
||||
*)
|
||||
@ -2932,7 +2939,7 @@ EOF
|
||||
if test "$need_lib_prefix" != no; then
|
||||
# Add the "lib" prefix for modules if required
|
||||
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
|
||||
eval shared_ext=\"$shrext\"
|
||||
eval shared_ext=\"$shrext_cmds\"
|
||||
eval libname=\"$libname_spec\"
|
||||
else
|
||||
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
|
||||
@ -3699,7 +3706,7 @@ EOF
|
||||
fi
|
||||
|
||||
# Get the real and link names of the library.
|
||||
eval shared_ext=\"$shrext\"
|
||||
eval shared_ext=\"$shrext_cmds\"
|
||||
eval library_names=\"$library_names_spec\"
|
||||
set dummy $library_names
|
||||
realname="$2"
|
||||
|
||||
18
m4/libtool.m4
vendored
18
m4/libtool.m4
vendored
@ -1486,7 +1486,7 @@ AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
@ -1603,7 +1603,7 @@ bsdi4*)
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@ -1668,7 +1668,7 @@ darwin* | rhapsody*)
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | $GREP "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
@ -1751,7 +1751,7 @@ hpux9* | hpux10* | hpux11*)
|
||||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
shrext='.so'
|
||||
shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@ -1766,7 +1766,7 @@ hpux9* | hpux10* | hpux11*)
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
@ -1777,7 +1777,7 @@ hpux9* | hpux10* | hpux11*)
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
shrext='.sl'
|
||||
shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
@ -1931,7 +1931,7 @@ openbsd*)
|
||||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
@ -3933,7 +3933,7 @@ _LT_EOF
|
||||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
shrext=".dll"
|
||||
shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
@ -4312,7 +4312,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
|
||||
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
|
||||
|
||||
_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
|
||||
_LT_DECL([], [shrext], [1], [Shared library suffix (normally ".so")])dnl
|
||||
_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
|
||||
_LT_DECL([], [extract_expsyms_cmds], [2],
|
||||
[The commands to extract the exported symbol list from a shared archive])
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user