2008-07-09 01:56:54 +02:00
|
|
|
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
|
2008-07-05 02:37:13 +02:00
|
|
|
dnl just for library $1. Separate tests with the same $1 and different $2s
|
2007-06-05 01:15:28 +02:00
|
|
|
dnl may have different results.
|
|
|
|
|
ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
|
2008-07-05 02:37:13 +02:00
|
|
|
-AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var,
|
|
|
|
|
+AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var, [
|
2008-07-09 01:56:54 +02:00
|
|
|
+if test "$libdir" != "${exec_prefix}/lib"; then
|
2008-07-05 02:37:13 +02:00
|
|
|
+ case $libdir in *64)
|
2007-06-05 16:42:12 +02:00
|
|
|
+ libsuffix=64
|
2008-07-05 02:37:13 +02:00
|
|
|
+ esac
|
2007-06-05 01:15:28 +02:00
|
|
|
+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
|
2008-07-05 02:37:13 +02:00
|
|
|
- [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.
|
