Browse code

search in non-multiarch dir (bb #1277)

git-svn: trunk@4451

Török Edvin authored on 2008/11/20 23:21:59
Showing 3 changed files
... ...
@@ -1,3 +1,7 @@
1
+Thu Nov 20 15:55:12 EET 2008 (edwin)
2
+------------------------------------
3
+ * configure, m4/lib-link.m4: search in non-multiarch dir (bb #1277)
4
+
1 5
 Wed Nov 19 17:31:50 CET 2008 (acab)
2 6
 -----------------------------------
3 7
  * clamav-milter: typo
... ...
@@ -16617,7 +16617,11 @@ fi
16617 16617
             fi
16618 16618
           fi
16619 16619
           if test "X$found_dir" = "X"; then
16620
-            for x in $LDFLAGS $LTLIBCHECK; do
16620
+            compat_libdir=
16621
+            if test "X$acl_libdirstem" != "Xlib"; then
16622
+		compat_libdir=-L'${exec_prefix}'/lib
16623
+	    fi
16624
+            for x in $LDFLAGS $LTLIBCHECK $compat_libdir; do
16621 16625
 
16622 16626
   acl_save_prefix="$prefix"
16623 16627
   prefix="$acl_final_prefix"
... ...
@@ -18013,7 +18017,11 @@ fi
18013 18013
             fi
18014 18014
           fi
18015 18015
           if test "X$found_dir" = "X"; then
18016
-            for x in $LDFLAGS $LTLIBBZ2; do
18016
+            compat_libdir=
18017
+            if test "X$acl_libdirstem" != "Xlib"; then
18018
+		compat_libdir=-L'${exec_prefix}'/lib
18019
+	    fi
18020
+            for x in $LDFLAGS $LTLIBBZ2 $compat_libdir; do
18017 18021
 
18018 18022
   acl_save_prefix="$prefix"
18019 18023
   prefix="$acl_final_prefix"
... ...
@@ -19481,7 +19489,11 @@ fi
19481 19481
             fi
19482 19482
           fi
19483 19483
           if test "X$found_dir" = "X"; then
19484
-            for x in $LDFLAGS $LTLIBGMP; do
19484
+            compat_libdir=
19485
+            if test "X$acl_libdirstem" != "Xlib"; then
19486
+		compat_libdir=-L'${exec_prefix}'/lib
19487
+	    fi
19488
+            for x in $LDFLAGS $LTLIBGMP $compat_libdir; do
19485 19489
 
19486 19490
   acl_save_prefix="$prefix"
19487 19491
   prefix="$acl_final_prefix"
... ...
@@ -268,7 +268,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
268 268
             fi
269 269
           fi
270 270
           if test "X$found_dir" = "X"; then
271
-            for x in $LDFLAGS $LTLIB[]NAME; do
271
+            compat_libdir=
272
+            if test "X$acl_libdirstem" != "Xlib"; then
273
+		compat_libdir=-L'${exec_prefix}'/lib
274
+	    fi
275
+            for x in $LDFLAGS $LTLIB[]NAME $compat_libdir; do
272 276
               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
273 277
               case "$x" in
274 278
                 -L*)