git-svn: trunk@4453
Török Edvin authored on 2008/11/21 04:53:14... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Thu Nov 20 21:53:39 EET 2008 (edwin) |
|
2 |
+------------------------------------ |
|
3 |
+ * configure, m4/lib-link.m4: more multiarch dir fixes (bb #1277) |
|
4 |
+ |
|
1 | 5 |
Thu Nov 20 18:50:12 CET 2008 (tk) |
2 | 6 |
--------------------------------- |
3 | 7 |
* freshclam/manager.c: add support for http proxy in SubmitDetectionStats |
... | ... |
@@ -16511,6 +16511,7 @@ if test "${with_libcheck_prefix+set}" = set; then |
16511 | 16511 |
if test "X$withval" = "Xno"; then |
16512 | 16512 |
use_additional=no |
16513 | 16513 |
else |
16514 |
+ additional_compat_libdir= |
|
16514 | 16515 |
if test "X$withval" = "X"; then |
16515 | 16516 |
|
16516 | 16517 |
acl_save_prefix="$prefix" |
... | ... |
@@ -16527,6 +16528,9 @@ if test "${with_libcheck_prefix+set}" = set; then |
16527 | 16527 |
else |
16528 | 16528 |
additional_includedir="$withval/include" |
16529 | 16529 |
additional_libdir="$withval/$acl_libdirstem" |
16530 |
+ if test "X$acl_libdirstem" != "Xlib"; then |
|
16531 |
+ additional_compat_libdir="-L$withval/lib" |
|
16532 |
+ fi |
|
16530 | 16533 |
fi |
16531 | 16534 |
fi |
16532 | 16535 |
|
... | ... |
@@ -16621,7 +16625,7 @@ fi |
16621 | 16621 |
if test "X$acl_libdirstem" != "Xlib"; then |
16622 | 16622 |
compat_libdir=-L'${exec_prefix}'/lib |
16623 | 16623 |
fi |
16624 |
- for x in $LDFLAGS $LTLIBCHECK $compat_libdir; do |
|
16624 |
+ for x in $LDFLAGS $LTLIBCHECK $compat_libdir $additional_compat_libdir; do |
|
16625 | 16625 |
|
16626 | 16626 |
acl_save_prefix="$prefix" |
16627 | 16627 |
prefix="$acl_final_prefix" |
... | ... |
@@ -16752,6 +16756,11 @@ fi |
16752 | 16752 |
LIBCHECK_PREFIX="$basedir" |
16753 | 16753 |
additional_includedir="$basedir/include" |
16754 | 16754 |
;; |
16755 |
+ */lib | */lib/) |
|
16756 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'` |
|
16757 |
+ LIBCHECK_PREFIX="$basedir" |
|
16758 |
+ additional_includedir="$basedir/include" |
|
16759 |
+ ;; |
|
16755 | 16760 |
esac |
16756 | 16761 |
if test "X$additional_includedir" != "X"; then |
16757 | 16762 |
if test "X$additional_includedir" != "X/usr/include"; then |
... | ... |
@@ -17911,6 +17920,7 @@ if test "${with_libbz2_prefix+set}" = set; then |
17911 | 17911 |
if test "X$withval" = "Xno"; then |
17912 | 17912 |
use_additional=no |
17913 | 17913 |
else |
17914 |
+ additional_compat_libdir= |
|
17914 | 17915 |
if test "X$withval" = "X"; then |
17915 | 17916 |
|
17916 | 17917 |
acl_save_prefix="$prefix" |
... | ... |
@@ -17927,6 +17937,9 @@ if test "${with_libbz2_prefix+set}" = set; then |
17927 | 17927 |
else |
17928 | 17928 |
additional_includedir="$withval/include" |
17929 | 17929 |
additional_libdir="$withval/$acl_libdirstem" |
17930 |
+ if test "X$acl_libdirstem" != "Xlib"; then |
|
17931 |
+ additional_compat_libdir="-L$withval/lib" |
|
17932 |
+ fi |
|
17930 | 17933 |
fi |
17931 | 17934 |
fi |
17932 | 17935 |
|
... | ... |
@@ -18021,7 +18034,7 @@ fi |
18021 | 18021 |
if test "X$acl_libdirstem" != "Xlib"; then |
18022 | 18022 |
compat_libdir=-L'${exec_prefix}'/lib |
18023 | 18023 |
fi |
18024 |
- for x in $LDFLAGS $LTLIBBZ2 $compat_libdir; do |
|
18024 |
+ for x in $LDFLAGS $LTLIBBZ2 $compat_libdir $additional_compat_libdir; do |
|
18025 | 18025 |
|
18026 | 18026 |
acl_save_prefix="$prefix" |
18027 | 18027 |
prefix="$acl_final_prefix" |
... | ... |
@@ -18152,6 +18165,11 @@ fi |
18152 | 18152 |
LIBBZ2_PREFIX="$basedir" |
18153 | 18153 |
additional_includedir="$basedir/include" |
18154 | 18154 |
;; |
18155 |
+ */lib | */lib/) |
|
18156 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'` |
|
18157 |
+ LIBBZ2_PREFIX="$basedir" |
|
18158 |
+ additional_includedir="$basedir/include" |
|
18159 |
+ ;; |
|
18155 | 18160 |
esac |
18156 | 18161 |
if test "X$additional_includedir" != "X"; then |
18157 | 18162 |
if test "X$additional_includedir" != "X/usr/include"; then |
... | ... |
@@ -19383,6 +19401,7 @@ if test "${with_libgmp_prefix+set}" = set; then |
19383 | 19383 |
if test "X$withval" = "Xno"; then |
19384 | 19384 |
use_additional=no |
19385 | 19385 |
else |
19386 |
+ additional_compat_libdir= |
|
19386 | 19387 |
if test "X$withval" = "X"; then |
19387 | 19388 |
|
19388 | 19389 |
acl_save_prefix="$prefix" |
... | ... |
@@ -19399,6 +19418,9 @@ if test "${with_libgmp_prefix+set}" = set; then |
19399 | 19399 |
else |
19400 | 19400 |
additional_includedir="$withval/include" |
19401 | 19401 |
additional_libdir="$withval/$acl_libdirstem" |
19402 |
+ if test "X$acl_libdirstem" != "Xlib"; then |
|
19403 |
+ additional_compat_libdir="-L$withval/lib" |
|
19404 |
+ fi |
|
19402 | 19405 |
fi |
19403 | 19406 |
fi |
19404 | 19407 |
|
... | ... |
@@ -19493,7 +19515,7 @@ fi |
19493 | 19493 |
if test "X$acl_libdirstem" != "Xlib"; then |
19494 | 19494 |
compat_libdir=-L'${exec_prefix}'/lib |
19495 | 19495 |
fi |
19496 |
- for x in $LDFLAGS $LTLIBGMP $compat_libdir; do |
|
19496 |
+ for x in $LDFLAGS $LTLIBGMP $compat_libdir $additional_compat_libdir; do |
|
19497 | 19497 |
|
19498 | 19498 |
acl_save_prefix="$prefix" |
19499 | 19499 |
prefix="$acl_final_prefix" |
... | ... |
@@ -19624,6 +19646,11 @@ fi |
19624 | 19624 |
LIBGMP_PREFIX="$basedir" |
19625 | 19625 |
additional_includedir="$basedir/include" |
19626 | 19626 |
;; |
19627 |
+ */lib | */lib/) |
|
19628 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'` |
|
19629 |
+ LIBGMP_PREFIX="$basedir" |
|
19630 |
+ additional_includedir="$basedir/include" |
|
19631 |
+ ;; |
|
19627 | 19632 |
esac |
19628 | 19633 |
if test "X$additional_includedir" != "X"; then |
19629 | 19634 |
if test "X$additional_includedir" != "X/usr/include"; then |
... | ... |
@@ -161,6 +161,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
161 | 161 |
if test "X$withval" = "Xno"; then |
162 | 162 |
use_additional=no |
163 | 163 |
else |
164 |
+ additional_compat_libdir= |
|
164 | 165 |
if test "X$withval" = "X"; then |
165 | 166 |
AC_LIB_WITH_FINAL_PREFIX([ |
166 | 167 |
eval additional_includedir=\"$includedir\" |
... | ... |
@@ -169,6 +170,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
169 | 169 |
else |
170 | 170 |
additional_includedir="$withval/include" |
171 | 171 |
additional_libdir="$withval/$acl_libdirstem" |
172 |
+ if test "X$acl_libdirstem" != "Xlib"; then |
|
173 |
+ additional_compat_libdir="-L$withval/lib" |
|
174 |
+ fi |
|
172 | 175 |
fi |
173 | 176 |
fi |
174 | 177 |
]) |
... | ... |
@@ -272,7 +276,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
272 | 272 |
if test "X$acl_libdirstem" != "Xlib"; then |
273 | 273 |
compat_libdir=-L'${exec_prefix}'/lib |
274 | 274 |
fi |
275 |
- for x in $LDFLAGS $LTLIB[]NAME $compat_libdir; do |
|
275 |
+ for x in $LDFLAGS $LTLIB[]NAME $compat_libdir $additional_compat_libdir; do |
|
276 | 276 |
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
277 | 277 |
case "$x" in |
278 | 278 |
-L*) |
... | ... |
@@ -422,6 +426,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
422 | 422 |
LIB[]NAME[]_PREFIX="$basedir" |
423 | 423 |
additional_includedir="$basedir/include" |
424 | 424 |
;; |
425 |
+ */lib | */lib/) |
|
426 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'` |
|
427 |
+ LIB[]NAME[]_PREFIX="$basedir" |
|
428 |
+ additional_includedir="$basedir/include" |
|
429 |
+ ;; |
|
425 | 430 |
esac |
426 | 431 |
if test "X$additional_includedir" != "X"; then |
427 | 432 |
dnl Potentially add $additional_includedir to $INCNAME. |