summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-06-10 16:45:27 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:13:23 +0200
commit880143810694357f3801b1bb17415fa8a6530722 (patch)
tree17180abbcbaa8b1021a725e7ea3c3b55b10a5d5a
parent05474b85eb1118ca83237deb3af62eb9a5b25197 (diff)
downloadexternal_gettext-880143810694357f3801b1bb17415fa8a6530722.zip
external_gettext-880143810694357f3801b1bb17415fa8a6530722.tar.gz
external_gettext-880143810694357f3801b1bb17415fa8a6530722.tar.bz2
Avoid a configure warning on Linux.
-rw-r--r--ChangeLog5
-rw-r--r--m4/libtool.m44
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c290e1d..e0dbe7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]: Avoid warning when
+ "parsing" /etc/ld.so.conf and empty /etc/ld.so.conf.d.
+
2006-06-04 Bruno Haible <bruno@clisp.org>
* PACKAGING: Mention inttypes-h.m4.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 1e481a2..01ad2fa 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,5 +1,5 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
## Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
##
@@ -1574,7 +1574,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