From 5a845c8b11b45cbedc6ac05b961baa0801ddaebb Mon Sep 17 00:00:00 2001 From: Daniel Reed Date: Fri, 19 Nov 2004 07:17:22 +0000 Subject: [PATCH] * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret `include' statements in toplevel ld.so.conf file. --- ChangeLog | 5 +++++ libtool.m4 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1cc040138..abfb0e50b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-18 Daniel Reed + + * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret + `include' statements in toplevel ld.so.conf file. + 2004-11-17 Ralf Wildenhues * tests/demo-nopic.test: Correctly skip hppa, x86_64, and s390*. diff --git a/libtool.m4 b/libtool.m4 index c3b71e893..4bcd29411 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1459,7 +1459,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | 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/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi -- 2.47.3