@@ -1,3 +1,8 @@

+Wed Oct 22 17:43:38 EEST 2008 (edwin)

+-------------------------------------

+ * configure, m4/acinclude.m4: When user has overriden --libdir, we

+ still need to find out the correct acl_libdirstem

+

 Mon Oct 20 17:23:12 EEST 2008 (edwin)

 -------------------------------------

  * aclocal.m4, configure, configure.in, m4/acinclude.m4,

@@ -11433,6 +11433,17 @@ echo $ECHO_N "checking for multiarch libdir... $ECHO_C" >&6; }

 		libdir='${exec_prefix}/'$acl_libdirstem

 		{ echo "$as_me:$LINENO: result: $libdir" >&5

 echo "${ECHO_T}$libdir" >&6; }

+	else

+		acl_libdirstem=lib

+		if test -d "$libdir"; then

+			case "$libdir" in

+				*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;

+				*) searchdir=`cd "$libdir" && pwd`

+				   case "$searchdir" in

+					*/lib64 ) acl_libdirstem=lib64 ;;

+				   esac

+			easc

+		fi

 	fi

@@ -763,6 +763,17 @@ AC_DEFUN([AC_LIB_MULTILIB_GUESS],

 		esac

 		libdir='${exec_prefix}/'$acl_libdirstem

 		AC_MSG_RESULT([$libdir])

+	else

+		acl_libdirstem=lib

+		if test -d "$libdir"; then

+			case "$libdir" in

+				*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;

+				*) searchdir=`cd "$libdir" && pwd`

+				   case "$searchdir" in

+					*/lib64 ) acl_libdirstem=lib64 ;;

+				   esac

+			easc

+		fi	

 	fi

 ])