From c1463c222072ef8820eebc6bb5f7cd0aebf799fa Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Fri, 23 Jan 2004 06:03:17 +0000 Subject: [PATCH] * m4/libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: Include directories found in /etc/ld.so.conf in sys_lib_dlsearch_path_spec. --- ChangeLog | 5 +++++ libtool.m4 | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6c33ac5ab..500675fe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-23 Scott James Remnant + + * m4/libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: Include + directories found in /etc/ld.so.conf in sys_lib_dlsearch_path_spec. + 2004-01-23 Scott James Remnant * ltmain.in: Add -pthread and similar to $deplibs ($compile_deplibs diff --git a/libtool.m4 b/libtool.m4 index 1f06caf6d..40a5ff1c8 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1441,6 +1441,12 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf` + sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, -- 2.47.3