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

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

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

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

+

 Wed Nov 19 20:50:13 EET 2008 (edwin)

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

  * libclamav/htmlnorm.c: r4396 got merged from trunk w/o the compiler

@@ -14264,7 +14264,11 @@ fi

             fi

           fi

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

-            for x in $LDFLAGS $LTLIBCHECK; do

+            compat_libdir=

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

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

+	    fi

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

   acl_save_prefix="$prefix"

   prefix="$acl_final_prefix"

@@ -15660,7 +15664,11 @@ fi

             fi

           fi

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

-            for x in $LDFLAGS $LTLIBBZ2; do

+            compat_libdir=

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

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

+	    fi

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

   acl_save_prefix="$prefix"

   prefix="$acl_final_prefix"

@@ -17120,7 +17128,11 @@ fi

             fi

           fi

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

-            for x in $LDFLAGS $LTLIBGMP; do

+            compat_libdir=

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

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

+	    fi

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

   acl_save_prefix="$prefix"

   prefix="$acl_final_prefix"

@@ -268,7 +268,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],

             fi

           fi

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

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

+            compat_libdir=

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

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

+	    fi

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

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

               case "$x" in

                 -L*)