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

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

diff --git a/ChangeLog b/ChangeLog
index 1cc0401385e4311787015bc7ef29cdd8cc178cc6..abfb0e50bc95300fd176dab17aa3172bcb109a4e 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-17  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * tests/demo-nopic.test: Correctly skip hppa, x86_64, and s390*.

diff --git a/libtool.m4 b/libtool.m4
index c3b71e8932670430f1e81defdbbe1d5cdec2ac3c..4bcd29411bb64da8d7381b7d6b9da4dddff327fd 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1459,7 +1459,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