@@ -1,3 +1,7 @@

+Fri Oct 30 14:04:43 EET 2009 (edwin)

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

+ * configure, m4/acinclude.m4: Avoid trailing slash in libdir for old gcc (#1738).

+

 Thu Oct 29 23:42:57 CET 2009 (acab)

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

  * win32/3rdparty/pthreads: upgrade to CVS HEAD

@@ -12139,7 +12139,7 @@ $as_echo "#define FILEBUFF 8192" >>confdefs.h

 $as_echo_n "checking for multiarch libdir... " >&6; }

 		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html

 		if test "$GCC" = yes; then

-			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS`

+			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` || ac_multilibdir=.

 		else

 			ac_multilibdir=.

 		fi

@@ -755,7 +755,7 @@ AC_DEFUN([AC_LIB_MULTILIB_GUESS],

 		AC_MSG_CHECKING([for multiarch libdir])

 		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html

 		if test "$GCC" = yes; then

-			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS`

+			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` || ac_multilibdir=.

 		else

 			ac_multilibdir=.

 		fi

@@ -778,7 +778,7 @@ AC_DEFUN([AC_LIB_MULTILIB_GUESS],

 					*/lib64 ) acl_libdirstem=lib64 ;;

 				   esac

 			esac

-		fi	

+		fi

 	fi

 ])