* libtool.m4 (AC_LIBTOOL_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 75186233246f08db1a5ec48517181ff3c1e63e54..cbc39255ce110526924bf65fd7c91e4a5bd7b062 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libtool.m4 (AC_LIBTOOL_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-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS) [ freebsd, dragonfly ]:

diff --git a/libtool.m4 b/libtool.m4
index 1841ecd83c9d34e518354fe775480fc9e494565e..dcc7522ea48a7eb06e090b3ef6c44161c4c7ad5d 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1581,7 +1581,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