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

Avoid warning when "parsing" `/etc/ld.so.conf' and empty
`/etc/ld.so.conf.d'.
Reported by Orion Poplawski <orion@cora.nwra.com>.

diff --git a/ChangeLog b/ChangeLog
index c9f06ac34f7ba2fb0735a6e82d373300cd0d00c6..6b01cbf8a97f67d4b75a1c91611dc6b705e108b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]:
+       Avoid warning when "parsing" `/etc/ld.so.conf' and empty
+       `/etc/ld.so.conf.d'.
+       Reported by Orion Poplawski <orion@cora.nwra.com>.
+
 2006-03-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * bootstrap: Actually use the correct version of the last patch.

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index a8fb02d334c0bf9724dde823cc08533a88781a19..36b7e3fb38e8ad39d22e05acf8d0d1004ae25dd7 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2291,7 +2291,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    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/#.*//;s/[:,   ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi