3
0
forked from pool/util-linux
util-linux/which-lib64.patch

29 lines
1.0 KiB
Diff
Raw Normal View History

Index: acinclude.m4
===================================================================
--- acinclude.m4.orig 2006-02-02 05:06:43.000000000 +0100
+++ acinclude.m4 2008-07-07 14:14:59.000000000 +0200
@@ -10,14 +10,19 @@ dnl because the test really is for libra
dnl just for library $1. Separate tests with the same $1 and different $2s
dnl may have different results.
ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var,
+AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var, [
+if test "$libdir" != "${exec_prefix}/lib"; then
+ case $libdir in *64)
+ libsuffix=64
+ esac
+fi
if test -r /etc/ld.so.conf ; then
- ld_so_paths="/lib /usr/lib `cat /etc/ld.so.conf`"
+ ld_so_paths="/lib${libsuffix} /usr/lib${libsuffix} `cat /etc/ld.so.conf`"
else
- ld_so_paths="/lib /usr/lib"
+ ld_so_paths="/lib${libsuffix} /usr/lib${libsuffix}"
fi
for path in $ld_so_paths; do
- [ac_save_LIBS="$LIBS"
+ ac_save_LIBS="$LIBS"
LIBS="$path/$1 $5 $LIBS"
AC_TRY_LINK(dnl
ifelse([$2], [main], , dnl Avoid conflicting decl of main.