@@ -1,3 +1,7 @@

+Tue Mar 24 19:41:25 CET 2009 (tk)

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

+ * configure: don't define HAVE_ZLIB_H

+

 Tue Mar 24 12:43:14 CET 2009 (acab)

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

  * clamav-milter: allow whitelisting based on the smtpauth login,

@@ -398,9 +398,6 @@

 /* This value is set to 1 to indicate that the system argz facility works */

 #undef HAVE_WORKING_ARGZ

-/* zlib installed */

-#undef HAVE_ZLIB_H

-

 /* Define if the OS needs help to load dependent libraries for dlopen(). */

 #undef LTDL_DLOPEN_DEPLIBS

@@ -18202,11 +18202,7 @@ fi

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

 $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }

 if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then

-  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

-

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

 else

   { { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5

 $as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

@@ -18361,11 +18357,7 @@ fi

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

 $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }

 if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then

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

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_ZLIB_H 1

-_ACEOF

-

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

 else

   { { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5

 $as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

@@ -532,12 +532,12 @@ else

 	save_LDFLAGS="$LDFLAGS"

 	save_LIBS="$LIBS"

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

-	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], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"], 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"

 	LIBS="$save_LIBS"

     else

-	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], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"], 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

@@ -46,9 +46,7 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.61 2007/02/12 20:46:09 njh Exp $";

 #include <sys/mman.h>

 #endif

-#ifdef HAVE_ZLIB_H

 #include <zlib.h>

-#endif

 #ifdef	C_WINDOWS

 #include <io.h>