mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-18 14:16:00 +08:00
*** empty log message ***
This commit is contained in:
parent
9817e05d7b
commit
c23e0a74db
13
ChangeLog
13
ChangeLog
@ -1,3 +1,12 @@
|
|||||||
|
1998-12-03 Thomas Tanner <tanner@gmx.de>
|
||||||
|
|
||||||
|
* ChangeLog: converted CR/LF back to CR format
|
||||||
|
* ltconfig.in: new variable sys_lib_search_path for searching
|
||||||
|
of installed libraries, export archive_sym_cmds and
|
||||||
|
sys_lib_search_path
|
||||||
|
* ltmain.in: use sys_lib_search_path, removed extradeplibs
|
||||||
|
(they're not portable)
|
||||||
|
|
||||||
1998-12-02 Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
|
1998-12-02 Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
|
||||||
|
|
||||||
* libltdl/configure.in: look for string.h or else strings.h, and
|
* libltdl/configure.in: look for string.h or else strings.h, and
|
||||||
@ -23,7 +32,7 @@
|
|||||||
* mdemo/modules/Makefile.am: replaced -export-symbols with
|
* mdemo/modules/Makefile.am: replaced -export-symbols with
|
||||||
-export-dynamic since it doesn't work for modules
|
-export-dynamic since it doesn't work for modules
|
||||||
|
|
||||||
1998-12-01 Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
|
1998-12-01 Gary V. Vaughan <garyv@oranda.demon.co.uk>
|
||||||
|
|
||||||
* README: Updated homepage pointer to gnu libtool page.
|
* README: Updated homepage pointer to gnu libtool page.
|
||||||
|
|
||||||
@ -46,7 +55,7 @@
|
|||||||
|
|
||||||
* config.guess, config.sub: imported from autoconf pre-2.13
|
* config.guess, config.sub: imported from autoconf pre-2.13
|
||||||
|
|
||||||
1998-11-27 Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
|
1998-11-27 Gary V. Vaughan <garyv@oranda.demon.co.uk>
|
||||||
|
|
||||||
* libtool (AM_PROG_LD): Oops... we need to know the host_os for
|
* libtool (AM_PROG_LD): Oops... we need to know the host_os for
|
||||||
the changes below. I'm not sure whether mingw32 and os2 support
|
the changes below. I'm not sure whether mingw32 and os2 support
|
||||||
|
18
ltconfig.in
18
ltconfig.in
@ -1558,10 +1558,11 @@ finish_eval=
|
|||||||
shlibpath_var=
|
shlibpath_var=
|
||||||
version_type=none
|
version_type=none
|
||||||
dynamic_linker="$host_os ld.so"
|
dynamic_linker="$host_os ld.so"
|
||||||
|
sys_lib_search_path="/lib /usr/lib /usr/local/lib"
|
||||||
check_shared_deplibs_method='none'
|
check_shared_deplibs_method='none'
|
||||||
# Need to set the preceding variable on all platforms that support
|
# Need to set the preceding variable on all platforms that support
|
||||||
# interlibrary dependencies.
|
# interlibrary dependencies.
|
||||||
# 'none' -- dependencies disabled.
|
# 'none' -- dependencies not supported.
|
||||||
# 'pass_all' -- all dependencies passed with no checks.
|
# 'pass_all' -- all dependencies passed with no checks.
|
||||||
# 'test_compile' -- check by making test program.
|
# 'test_compile' -- check by making test program.
|
||||||
# 'file_regex' -- check by looking for filenames that look like the shared
|
# 'file_regex' -- check by looking for filenames that look like the shared
|
||||||
@ -1662,6 +1663,7 @@ linux-gnu*)
|
|||||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
|
check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
|
||||||
|
sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
|
||||||
|
|
||||||
if test -f /lib/ld.so.1; then
|
if test -f /lib/ld.so.1; then
|
||||||
dynamic_linker='GNU ld.so'
|
dynamic_linker='GNU ld.so'
|
||||||
@ -1802,16 +1804,18 @@ case "$ltmain" in
|
|||||||
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
|
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
|
||||||
whole_archive_flag_spec libname_spec library_names_spec soname_spec \
|
whole_archive_flag_spec libname_spec library_names_spec soname_spec \
|
||||||
RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
|
RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
|
||||||
old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \
|
old_postuninstall_cmds archive_cmds archive_sym_cmds postinstall_cmds postuninstall_cmds \
|
||||||
check_shared_deplibs_method allow_undefined_flag no_undefined_flag \
|
check_shared_deplibs_method allow_undefined_flag no_undefined_flag \
|
||||||
finish_cmds finish_eval global_symbol_pipe \
|
finish_cmds finish_eval global_symbol_pipe \
|
||||||
hardcode_libdir_flag_spec hardcode_libdir_separator \
|
hardcode_libdir_flag_spec hardcode_libdir_separator sys_lib_search_path \
|
||||||
compiler_c_o compiler_o_lo need_locks; do
|
compiler_c_o compiler_o_lo need_locks; do
|
||||||
|
|
||||||
case "$var" in
|
case "$var" in
|
||||||
reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
|
reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
|
||||||
old_postinstall_cmds | old_postuninstall_cmds | archive_cmds | \
|
old_postinstall_cmds | old_postuninstall_cmds | \
|
||||||
postinstall_cmds | postuninstall_cmds | finish_cmds)
|
archive_cmds | archive_sym_cmds | \
|
||||||
|
postinstall_cmds | postuninstall_cmds | \
|
||||||
|
finish_cmds | sys_lib_search_path)
|
||||||
# Double-quote double-evaled strings.
|
# Double-quote double-evaled strings.
|
||||||
eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`\\\""
|
eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`\\\""
|
||||||
;;
|
;;
|
||||||
@ -2006,6 +2010,7 @@ old_archive_from_new_cmds=$old_archive_from_new_cmds
|
|||||||
|
|
||||||
# Commands used to build and install a shared archive.
|
# Commands used to build and install a shared archive.
|
||||||
archive_cmds=$archive_cmds
|
archive_cmds=$archive_cmds
|
||||||
|
archive_sym_cmds=$archive_sym_cmds
|
||||||
postinstall_cmds=$postinstall_cmds
|
postinstall_cmds=$postinstall_cmds
|
||||||
postuninstall_cmds=$postuninstall_cmds
|
postuninstall_cmds=$postuninstall_cmds
|
||||||
|
|
||||||
@ -2055,6 +2060,9 @@ hardcode_minus_L=$hardcode_minus_L
|
|||||||
# the resulting binary.
|
# the resulting binary.
|
||||||
hardcode_shlibpath_var=$hardcode_shlibpath_var
|
hardcode_shlibpath_var=$hardcode_shlibpath_var
|
||||||
|
|
||||||
|
# System search path for libraries
|
||||||
|
sys_lib_search_path=$sys_lib_search_path
|
||||||
|
|
||||||
# Fix the shell variable \$srcfile for the compiler.
|
# Fix the shell variable \$srcfile for the compiler.
|
||||||
fix_srcfile_path="$fix_srcfile_path"
|
fix_srcfile_path="$fix_srcfile_path"
|
||||||
EOF
|
EOF
|
||||||
|
29
ltmain.in
29
ltmain.in
@ -575,8 +575,7 @@ compiler."
|
|||||||
convenience=
|
convenience=
|
||||||
old_convenience=
|
old_convenience=
|
||||||
deplibs=
|
deplibs=
|
||||||
extradeplibs=
|
eval lib_search_path=\"$sys_lib_search_path\"
|
||||||
lib_search_path="/lib /usr/lib"
|
|
||||||
|
|
||||||
dlfiles=
|
dlfiles=
|
||||||
dlprefiles=
|
dlprefiles=
|
||||||
@ -729,12 +728,10 @@ compiler."
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
deplibs="$deplibs $arg"
|
deplibs="$deplibs $arg"
|
||||||
extradeplibs="$extradeplibs $arg"
|
|
||||||
lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
|
lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-l*) deplibs="$deplibs $arg" ;;
|
-l*) deplibs="$deplibs $arg" ;;
|
||||||
-El*) extradeplibs="$extradeplibs -`expr $arg : '-E\(.*\)'`" ;;
|
|
||||||
|
|
||||||
-module)
|
-module)
|
||||||
module=yes
|
module=yes
|
||||||
@ -1368,7 +1365,7 @@ compiler."
|
|||||||
int main() { return 0; }
|
int main() { return 0; }
|
||||||
EOF
|
EOF
|
||||||
$rm a.out
|
$rm a.out
|
||||||
$C_compiler conftest.c $deplibs $extradeplibs
|
$C_compiler conftest.c $deplibs
|
||||||
if test $? -eq 0 ; then
|
if test $? -eq 0 ; then
|
||||||
ldd_output=`ldd a.out`
|
ldd_output=`ldd a.out`
|
||||||
for i in $deplibs; do
|
for i in $deplibs; do
|
||||||
@ -1394,31 +1391,13 @@ EOF
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
# Error occured in the first compile. Let's try to salvage the situation:
|
# Error occured in the first compile. Let's try to salvage the situation:
|
||||||
# 1) Is the error in the extradeplibs?
|
# Compile a seperate program for each library.
|
||||||
$rm a.out
|
|
||||||
$C_compiler conftest.c $extradeplibs
|
|
||||||
if test $? -ne 0 ; then
|
|
||||||
echo
|
|
||||||
echo "*** Warning! Not all libraries necessary to the dependent libraries are"
|
|
||||||
echo "*** working! You will probably need to install some of:"
|
|
||||||
echo "*** $extradeplibs"
|
|
||||||
echo "*** before this library will be fully functional. Installing these"
|
|
||||||
echo "*** libraries before continuing would be even better."
|
|
||||||
newextradeplibs=
|
|
||||||
for i in $extradeplibs; do
|
|
||||||
if test `expr "$i" : '-L'` -ne 0 ; then
|
|
||||||
newextradeplibs="$newextradeplibs $i"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
extradeplibs=$newextradeplibs
|
|
||||||
fi
|
|
||||||
# 2) Compile a seperate program for each library.
|
|
||||||
for i in $deplibs; do
|
for i in $deplibs; do
|
||||||
name="`expr $i : '-l\(.*\)'`"
|
name="`expr $i : '-l\(.*\)'`"
|
||||||
# If $name is empty we are operating on a -L argument.
|
# If $name is empty we are operating on a -L argument.
|
||||||
if test "$name" != "" ; then
|
if test "$name" != "" ; then
|
||||||
$rm a.out
|
$rm a.out
|
||||||
$C_compiler conftest.c $i $extradeplibs
|
$C_compiler conftest.c $i
|
||||||
# Did it work?
|
# Did it work?
|
||||||
if test $? -eq 0 ; then
|
if test $? -eq 0 ; then
|
||||||
ldd_output=`ldd a.out`
|
ldd_output=`ldd a.out`
|
||||||
|
Loading…
Reference in New Issue
Block a user