From c4321a8af08bf19746a6a5aac6d96afb611f1748 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 12 Jan 2005 12:59:32 +0000 Subject: [PATCH] * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: While "parsing" /etc/ld.so.conf, skip comments. Reported by Jens Elkner . --- ChangeLog | 6 ++++++ m4/libtool.m4 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6d04ed59..e651d5f88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-12 Ralf Wildenhues + + * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: While "parsing" + /etc/ld.so.conf, skip comments. + Reported by Jens Elkner . + 2005-01-10 Peter O'Gorman * config/ltmain.m4sh (func_mode_link): Fix diff --git a/m4/libtool.m4 b/m4/libtool.m4 index d66eaf0e3..5c6e3780a 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1980,7 +1980,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 -- 2.47.2