mirror/clamav
1
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2026-05-19 05:46:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert last commit

Browse Source 
git-svn: trunk@4197
This commit is contained in:
Török Edvin
2008-09-22 14:46:14 +00:00
parent 37bc3097b1
commit 945655bd9f
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
configure vendored
View File

@@ -15833,9 +15833,16 @@ echo "${ECHO_T}$ac_cv_libbz2_libs" >&6; }
save_LIBS="$LIBS"
LIBS="$LIBBZ2";
cat >conftest.$ac_ext <<_ACEOF
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
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -15875,22 +15882,30 @@ 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
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS"
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

8
configure.in
View File

@@ -431,12 +431,12 @@ want_bzip2=$enableval, want_bzip2="yes")
if test "$want_bzip2" = "yes"
then
AC_LIB_LINKFLAGS([bz2])
save_LIBS="$LIBS"
LIBS="$LIBS $LIBBZ2";
AC_LINK_IFELSE([AC_LANG_CALL([],[bzReadOpen])],
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib";
AC_CHECK_LIB([bz2], [bzReadOpen],
[AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])]
)
LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS"
if test "$HAVE_LIBBZ2" = "yes"; then
AC_CHECK_HEADER([bzlib.h],
[AC_C_CVE_2008_1372],