@@ -1,3 +1,9 @@

+Wed Oct 29 21:48:03 EET 2008 (edwin)

+------------------------------------

+ * configure, configure.in, m4/acinclude.m4: Try to make a difference

+ between failing to link the bzip2 testcase and the testcase failing

+ (bb #1240)

+

 Wed Oct 29 21:40:20 EET 2008 (edwin)

 ------------------------------------

  * configure, configure.in: fix message: it is enough to use a lower

@@ -16311,7 +16311,13 @@ echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

 ( exit $ac_status )

-ac_cv_c_cve_2008_1372=bugged

+

+if test $? -gt 127; then

+	ac_cv_c_cve_2008_1372=bugged

+else

+	ac_cv_c_cve_2008_1372=linkfailed

+fi

+

 fi

 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi

@@ -16336,9 +16342,19 @@ echo "$as_me: WARNING: ****** We strongly suggest you to update to bzip2 1.0.5."

 		{ echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5

 echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}

 	fi

+	if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then

+						{ echo "$as_me:$LINENO: WARNING: ****** Unable to link bzip2 testcase" >&5

+echo "$as_me: WARNING: ****** Unable to link bzip2 testcase" >&2;}

+		{ echo "$as_me:$LINENO: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&5

+echo "$as_me: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&2;}

+		{ echo "$as_me:$LINENO: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&5

+echo "$as_me: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&2;}

+		{ echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5

+echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}

+	fi

 	case "$ac_cv_c_cve_2008_1372" in

-	ok|bugged)

+	ok|bugged|linkfailed)

 		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"

 cat >>confdefs.h <<\_ACEOF

@@ -544,9 +544,17 @@ then

 		AC_MSG_WARN([****** We strongly suggest you to update to bzip2 1.0.5.])

 		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])

 	fi

+	if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then

+		dnl This shouldn't happen

+		dnl We failed to link but libtool may still be able to link, so don't disable bzip2 just yet

+		AC_MSG_WARN([****** Unable to link bzip2 testcase])

+		AC_MSG_WARN([****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify])

+		AC_MSG_WARN([****** It is recommended to fix your build environment so that we can run the testcase!])

+		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])

+	fi

 	case "$ac_cv_c_cve_2008_1372" in

-	ok|bugged)

+	ok|bugged|linkfailed)

 		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"

 		AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])

 		;;

@@ -683,7 +683,13 @@ int main (int argc, char **argv) {

         BZ2_bzDecompressEnd(&bz);

         return 0;

 }

-], [ac_cv_c_cve_2008_1372=ok], [ac_cv_c_cve_2008_1372=bugged], [ac_cv_c_cve_2008_1372=ok])

+], [ac_cv_c_cve_2008_1372=ok], [

+if test $? -gt 127; then 

+	ac_cv_c_cve_2008_1372=bugged

+else

+	ac_cv_c_cve_2008_1372=linkfailed

+fi

+], [ac_cv_c_cve_2008_1372=ok])

 LIBS="$save_LIBS"

 ])

 ])