Don't pick up double-quotes from /etc/ld.so.conf on Ubuntu.

* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
<sys_lib_dlsearch_path_spec>: Remove embedded double quotes from
paths picked up from /etc/ld.so.conf.  Fixes libltdl compile
failure on Ubuntu 7.10.
* THANKS: Update.
Report by Camilo La Rota.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index e278549b062d2e206ece953e6f1bb215fe3922a0..8220712000ee72f3727f5a25446b861cc3ae6c68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Don't pick up double-quotes from /etc/ld.so.conf on Ubuntu.
+       * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
+       <sys_lib_dlsearch_path_spec>: Remove embedded double quotes from
+       paths picked up from /etc/ld.so.conf.  Fixes libltdl compile
+       failure on Ubuntu 7.10.
+       * THANKS: Update.
+       Report by Camilo La Rota.
+
 2009-06-06  Richard Sandiford  <richards@transitive.com>
 
        Fix GNU nm invocation for AIX.

diff --git a/THANKS b/THANKS
index 9bf16db9037e75dea3d299aebb838e6189369c9d..51c99cc300a6f5ee88ae0711e7a1771193b8459c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -76,6 +76,7 @@
   Brad Smith                   brad@comstyle.com
   Brian Barrett                        brbarret@osl.iu.edu
   Bruno Haible                 haible@ilog.fr
+  Camilo La Rota               camilo.larota@ens-lyon.fr
   Carl D. Roth                 roth@cse.ucsc.edu
   Chris P. Ross                        cross@eng.us.uu.net
   Christian Biesinger          cbiesinger@web.de

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index a7d9bf507c967ca43304572102ebea967759345d..0670980a281e09c27d6c31c62c341bc9feec3529 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2416,7 +2416,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
 
   # 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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;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/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi