@@ -1,3 +1,8 @@

+Mon Apr 21 17:25:41 EEST 2008 (edwin)

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

+  * configure: explicitly link freshclam with zlib, better zlib checks (bb

+  #935)

+

 Mon Apr 21 16:21:56 CEST 2008 (tk)

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

   * libclamav/cvd.c: add work-around for zlib issues with mixed data (bb#932)

@@ -21,7 +26,7 @@ Fri Apr 18 18:33:59 CEST 2008 (tk)

 Fri Apr 18 13:55:41 EEST 2008 (edwin)

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

-  * libclamav/dconf.h: fix flag code assignment

+  * libclamav/dconf.h: fix flag code assignment (bb #952)

 Wed Apr 16 20:10:17 CEST 2008 (tk)

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

@@ -171,6 +171,9 @@

 /* Define to 1 if you have the <libmilter/mfapi.h> header file. */

 #undef HAVE_LIBMILTER_MFAPI_H

+/* Define to 1 if you have the `z' library (-lz). */

+#undef HAVE_LIBZ

+

 /* Define to 1 if you have the <limits.h> header file. */

 #undef HAVE_LIMITS_H

@@ -43,7 +43,7 @@ EXIT_FAILURE=1

 PROGRAM=ltmain.sh

 PACKAGE=libtool

-VERSION="1.5.26 Debian 1.5.26-1"

+VERSION="1.5.26 Debian 1.5.26-3"

 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"

 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

@@ -13557,7 +13557,7 @@ fi

 { echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5

 echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }

 if test $ac_cv_lib_z_inflateEnd = yes; then

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz";

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_ZLIB_H 1

 _ACEOF

@@ -13568,6 +13568,81 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

    { (exit 1); exit 1; }; }

 fi

+

+{ echo "$as_me:$LINENO: checking for gzopen in -lz" >&5

+echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }

+if test "${ac_cv_lib_z_gzopen+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lz  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char gzopen ();

+int

+main ()

+{

+return gzopen ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  ac_cv_lib_z_gzopen=yes

+else

+  echo "$as_me: failed program was:" >&5

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

+

+	ac_cv_lib_z_gzopen=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_z_gzopen" >&5

+echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }

+if test $ac_cv_lib_z_gzopen = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define HAVE_LIBZ 1

+_ACEOF

+

+  LIBS="-lz $LIBS"

+

+else

+  { { echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5

+echo "$as_me: error: Your zlib is missing gzopen()" >&2;}

+   { (exit 1); exit 1; }; }

+fi

+

 	LDFLAGS="$save_LDFLAGS"

     else

 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5

@@ -13632,7 +13707,7 @@ fi

 { echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5

 echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }

 if test $ac_cv_lib_z_inflateEnd = yes; then

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz";

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_ZLIB_H 1

 _ACEOF

@@ -13643,6 +13718,81 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

    { (exit 1); exit 1; }; }

 fi

+

+{ echo "$as_me:$LINENO: checking for gzopen in -lz" >&5

+echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }

+if test "${ac_cv_lib_z_gzopen+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lz  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char gzopen ();

+int

+main ()

+{

+return gzopen ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  ac_cv_lib_z_gzopen=yes

+else

+  echo "$as_me: failed program was:" >&5

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

+

+	ac_cv_lib_z_gzopen=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_z_gzopen" >&5

+echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }

+if test $ac_cv_lib_z_gzopen = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define HAVE_LIBZ 1

+_ACEOF

+

+  LIBS="-lz $LIBS"

+

+else

+  { { echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5

+echo "$as_me: error: Your zlib is missing gzopen()" >&2;}

+   { (exit 1); exit 1; }; }

+fi

+

     fi

 fi

@@ -386,10 +386,12 @@ else

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

 	save_LDFLAGS="$LDFLAGS"

 	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"

-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))

 	LDFLAGS="$save_LDFLAGS"

     else

-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))

     fi

 fi

@@ -55,7 +55,7 @@ target_triplet = @target@

 @VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map

 subdir = libclamav

 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

-	$(srcdir)/Makefile.in COPYING

+	$(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \