From: Ralf Wildenhues Date: Tue, 28 Mar 2006 18:12:50 +0000 (+0000) Subject: * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ linux ]: X-Git-Tag: release-1-5-23b~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bf81d1371dd6ea5a8f4349e3f9d9f570b857978;p=thirdparty%2Flibtool.git * 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 . --- diff --git a/ChangeLog b/ChangeLog index 751862332..cbc39255c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-28 Ralf Wildenhues + + * 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 . + 2006-03-23 Ralf Wildenhues * ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS) [ freebsd, dragonfly ]: diff --git a/libtool.m4 b/libtool.m4 index 1841ecd83..dcc7522ea 100644 --- 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