From: Karel Zak <kzak@redhat.com>
Date: Tue, 17 Mar 2009 08:40:17 +0000 (+0100)
Subject: build-sys: refresh generated libtool-2 stuff
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa7928c136c3aa93ef83cb46f2c17c4ac6085140;p=util-linux

build-sys: refresh generated libtool-2 stuff

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 39ba996c..671cde11 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2470,10 +2470,13 @@ linux* | k*bsd*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # 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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on