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

+Thu Nov 20 21:53:39 EET 2008 (edwin)

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

+ * configure, m4/lib-link.m4: more multiarch dir fixes (bb #1277)

+

 Thu Nov 20 15:55:12 EET 2008 (edwin)

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

  * configure, m4/lib-link.m4: search in non-multiarch dir (bb #1277)

@@ -14158,6 +14158,7 @@ if test "${with_libcheck_prefix+set}" = set; then

     if test "X$withval" = "Xno"; then

       use_additional=no

     else

+      additional_compat_libdir=

       if test "X$withval" = "X"; then

   acl_save_prefix="$prefix"

@@ -14174,6 +14175,9 @@ if test "${with_libcheck_prefix+set}" = set; then

       else

         additional_includedir="$withval/include"

         additional_libdir="$withval/$acl_libdirstem"

+	if test "X$acl_libdirstem" != "Xlib"; then

+		additional_compat_libdir="-L$withval/lib"

+	fi

       fi

     fi

@@ -14268,7 +14272,7 @@ fi

             if test "X$acl_libdirstem" != "Xlib"; then

 		compat_libdir=-L'${exec_prefix}'/lib

 	    fi

-            for x in $LDFLAGS $LTLIBCHECK $compat_libdir; do

+            for x in $LDFLAGS $LTLIBCHECK $compat_libdir $additional_compat_libdir; do

   acl_save_prefix="$prefix"

   prefix="$acl_final_prefix"

@@ -14399,6 +14403,11 @@ fi

                 LIBCHECK_PREFIX="$basedir"

                 additional_includedir="$basedir/include"

                 ;;

+	     */lib | */lib/)

+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`

+                LIBCHECK_PREFIX="$basedir"

+                additional_includedir="$basedir/include"

+                ;;

             esac

             if test "X$additional_includedir" != "X"; then

                                                                                                                 if test "X$additional_includedir" != "X/usr/include"; then

@@ -15558,6 +15567,7 @@ if test "${with_libbz2_prefix+set}" = set; then

     if test "X$withval" = "Xno"; then

       use_additional=no

     else

+      additional_compat_libdir=

       if test "X$withval" = "X"; then

   acl_save_prefix="$prefix"

@@ -15574,6 +15584,9 @@ if test "${with_libbz2_prefix+set}" = set; then

       else

         additional_includedir="$withval/include"

         additional_libdir="$withval/$acl_libdirstem"

+	if test "X$acl_libdirstem" != "Xlib"; then

+		additional_compat_libdir="-L$withval/lib"

+	fi

       fi

     fi

@@ -15668,7 +15681,7 @@ fi

             if test "X$acl_libdirstem" != "Xlib"; then

 		compat_libdir=-L'${exec_prefix}'/lib

 	    fi

-            for x in $LDFLAGS $LTLIBBZ2 $compat_libdir; do

+            for x in $LDFLAGS $LTLIBBZ2 $compat_libdir $additional_compat_libdir; do

   acl_save_prefix="$prefix"

   prefix="$acl_final_prefix"

@@ -15799,6 +15812,11 @@ fi

                 LIBBZ2_PREFIX="$basedir"

                 additional_includedir="$basedir/include"

                 ;;

+	     */lib | */lib/)

+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`

+                LIBBZ2_PREFIX="$basedir"

+                additional_includedir="$basedir/include"

+                ;;

             esac

             if test "X$additional_includedir" != "X"; then

                                                                                                                 if test "X$additional_includedir" != "X/usr/include"; then

@@ -17022,6 +17040,7 @@ if test "${with_libgmp_prefix+set}" = set; then

     if test "X$withval" = "Xno"; then

       use_additional=no

     else

+      additional_compat_libdir=

       if test "X$withval" = "X"; then

   acl_save_prefix="$prefix"

@@ -17038,6 +17057,9 @@ if test "${with_libgmp_prefix+set}" = set; then

       else

         additional_includedir="$withval/include"

         additional_libdir="$withval/$acl_libdirstem"

+	if test "X$acl_libdirstem" != "Xlib"; then

+		additional_compat_libdir="-L$withval/lib"

+	fi

       fi

     fi

@@ -17132,7 +17154,7 @@ fi

             if test "X$acl_libdirstem" != "Xlib"; then

 		compat_libdir=-L'${exec_prefix}'/lib

 	    fi

-            for x in $LDFLAGS $LTLIBGMP $compat_libdir; do

+            for x in $LDFLAGS $LTLIBGMP $compat_libdir $additional_compat_libdir; do

   acl_save_prefix="$prefix"

   prefix="$acl_final_prefix"

@@ -17263,6 +17285,11 @@ fi

                 LIBGMP_PREFIX="$basedir"

                 additional_includedir="$basedir/include"

                 ;;

+	     */lib | */lib/)

+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`

+                LIBGMP_PREFIX="$basedir"

+                additional_includedir="$basedir/include"

+                ;;

             esac

             if test "X$additional_includedir" != "X"; then

                                                                                                                 if test "X$additional_includedir" != "X/usr/include"; then

@@ -161,6 +161,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

     if test "X$withval" = "Xno"; then

       use_additional=no

     else

+      additional_compat_libdir=

       if test "X$withval" = "X"; then

         AC_LIB_WITH_FINAL_PREFIX([

           eval additional_includedir=\"$includedir\"

@@ -169,6 +170,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

       else

         additional_includedir="$withval/include"

         additional_libdir="$withval/$acl_libdirstem"

+	if test "X$acl_libdirstem" != "Xlib"; then

+		additional_compat_libdir="-L$withval/lib"

+	fi

       fi

     fi

 ])

@@ -272,7 +276,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

             if test "X$acl_libdirstem" != "Xlib"; then

 		compat_libdir=-L'${exec_prefix}'/lib

 	    fi

-            for x in $LDFLAGS $LTLIB[]NAME $compat_libdir; do

+            for x in $LDFLAGS $LTLIB[]NAME $compat_libdir $additional_compat_libdir; do

               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])

               case "$x" in

                 -L*)

@@ -422,6 +426,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

                 LIB[]NAME[]_PREFIX="$basedir"

                 additional_includedir="$basedir/include"

                 ;;

+	     */lib | */lib/)

+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`

+                LIB[]NAME[]_PREFIX="$basedir"

+                additional_includedir="$basedir/include"

+                ;;

             esac

             if test "X$additional_includedir" != "X"; then

               dnl Potentially add $additional_includedir to $INCNAME.