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

`include' statements in toplevel ld.so.conf file.

diff --git a/ChangeLog b/ChangeLog
index f6724e83ff15388741a611830ed0f9b55d0d3ce0..c71fa37c553954d4764692d4908d54ec79555da2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]:

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index d7b36eaa7f1d399a1b85e13d3462b232609e5eb8..4240a5eb05c1f037903f26f3686f8747a2066aa6 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -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