[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit bc794573c78cd97e5c019b0160775aa84e2d757c
Author: Török Edvin <edwin at clamav.net>
Date:   Sat Nov 14 17:17:55 2009 +0200

    Fix build on Solaris8: bzip2 is present both in /usr/lib and /opt/csw/lib,
    configure checks the latter, why libclamav is linked to the former. We need to
    check the actual library we'll be linking to.

diff --git a/configure b/configure
index 7b6e162..7779cfb 100755
--- a/configure
+++ b/configure
@@ -15508,7 +15508,8 @@ $as_echo "$ac_cv_libbz2_libs" >&6; }
 
 
     save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
+    # Only add -L if prefix is not empty
+    test -z "$LIBBZ2_PREFIX" || LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
 
     have_bzprefix="no"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzReadOpen in -lbz2" >&5
diff --git a/configure.in b/configure.in
index 115420e..2e403fe 100644
--- a/configure.in
+++ b/configure.in
@@ -571,7 +571,8 @@ if test "$want_bzip2" = "yes"
 then
     AC_LIB_LINKFLAGS([bz2])
     save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
+    # Only add -L if prefix is not empty
+    test -z "$LIBBZ2_PREFIX" || LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
 
     have_bzprefix="no"
     AC_CHECK_LIB([bz2], [BZ2_bzReadOpen], [have_bzprefix="yes"])

-- 
Debian repository for ClamAV