From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 12 Jan 2005 12:57:32 +0000 (+0000)
Subject: * libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: While "parsing"
X-Git-Tag: release-2-1b~786
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f7dbb99ebee641302a6999959cbc299f3913285;p=thirdparty%2Flibtool.git

* libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: While "parsing"
/etc/ld.so.conf, skip comments.
Reported by Jens Elkner <elkner@linofee.org>.
---

diff --git a/ChangeLog b/ChangeLog
index 8c1518107..3001162b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: While "parsing"
+	/etc/ld.so.conf, skip comments.
+	Reported by Jens Elkner <elkner@linofee.org>.
+
 2005-01-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/libltdl/lt__glibc.h: Move all exported slist
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 0f77ddf51..6a2da7af4 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1987,7 +1987,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/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' | 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/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi