* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret

`include' statements in toplevel ld.so.conf file.
This commit is contained in:
Daniel Reed 2004-11-19 07:18:30 +00:00 committed by Ralf Wildenhues
parent 5f07f593a8
commit 30ab30e06a
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2004-11-18 Daniel Reed <djr@redhat.com>
* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret
`include' statements in toplevel ld.so.conf file.
2004-11-18 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* m4/libtool.m4 (_LT_LINKER_SHLIBS) [cygwin/mingw/pw32]:

2
m4/libtool.m4 vendored
View File

@ -1970,7 +1970,7 @@ linux*)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi