From 37bc3097b1d050070421e9203850f416485070d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
Date: Mon, 22 Sep 2008 14:08:49 +0000
Subject: [PATCH] more reliable linking with bzip2, $LIBBZ2_PREFIX is not
 always set.

git-svn: trunk@4196
---
 configure    | 37 +++++++++++--------------------------
 configure.in |  8 ++++----
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/configure b/configure
index f884d192a..f05ac105d 100755
--- a/configure
+++ b/configure
@@ -15833,16 +15833,9 @@ echo "${ECHO_T}$ac_cv_libbz2_libs" >&6; }
 
 
 
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib";
-    { echo "$as_me:$LINENO: checking for bzReadOpen in -lbz2" >&5
-echo $ECHO_N "checking for bzReadOpen in -lbz2... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bz2_bzReadOpen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbz2  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+    save_LIBS="$LIBS"
+    LIBS="$LIBBZ2";
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15882,30 +15875,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_bz2_bzReadOpen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bz2_bzReadOpen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzReadOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_bz2_bzReadOpen" >&6; }
-if test $ac_cv_lib_bz2_bzReadOpen = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define NOBZ2PREFIX 1
 _ACEOF
 
 
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
-    LDFLAGS="$save_LDFLAGS"
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+    LIBS="$save_LIBS"
     if test "$HAVE_LIBBZ2" = "yes"; then
 	if test "${ac_cv_header_bzlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for bzlib.h" >&5
diff --git a/configure.in b/configure.in
index 1fb2601b6..bebefa2b1 100644
--- a/configure.in
+++ b/configure.in
@@ -431,12 +431,12 @@ want_bzip2=$enableval, want_bzip2="yes")
 if test "$want_bzip2" = "yes"
 then
     AC_LIB_LINKFLAGS([bz2])
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib";
-    AC_CHECK_LIB([bz2], [bzReadOpen],
+    save_LIBS="$LIBS"
+    LIBS="$LIBS $LIBBZ2";
+    AC_LINK_IFELSE([AC_LANG_CALL([],[bzReadOpen])],
 		 [AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])]
 		)
-    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
     if test "$HAVE_LIBBZ2" = "yes"; then
 	AC_CHECK_HEADER([bzlib.h],
 			[AC_C_CVE_2008_1372],