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

+Wed Sep 13 00:35:57 CEST 2006 (tk)

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

+  * configure: add -lresolv to CLAMAV_MILTER_LIBS, patch from Stephen Gran

+

 Wed Sep 13 00:03:30 CEST 2006 (acab)

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

   * libclamav: Merge of the html normaliser part of the phishing module from

@@ -1,6 +1,6 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.60a.

+# Generated by GNU Autoconf 2.60.

 #

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

@@ -724,36 +724,36 @@ ac_unique_file="clamscan/clamscan.c"

 # Factoring default headers for most tests.

 ac_includes_default="\

 #include <stdio.h>

-#ifdef HAVE_SYS_TYPES_H

+#if HAVE_SYS_TYPES_H

 # include <sys/types.h>

 #endif

-#ifdef HAVE_SYS_STAT_H

+#if HAVE_SYS_STAT_H

 # include <sys/stat.h>

 #endif

-#ifdef STDC_HEADERS

+#if STDC_HEADERS

 # include <stdlib.h>

 # include <stddef.h>

 #else

-# ifdef HAVE_STDLIB_H

+# if HAVE_STDLIB_H

 #  include <stdlib.h>

 # endif

 #endif

-#ifdef HAVE_STRING_H

-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

+#if HAVE_STRING_H

+# if !STDC_HEADERS && HAVE_MEMORY_H

 #  include <memory.h>

 # endif

 # include <string.h>

 #endif

-#ifdef HAVE_STRINGS_H

+#if HAVE_STRINGS_H

 # include <strings.h>

 #endif

-#ifdef HAVE_INTTYPES_H

+#if HAVE_INTTYPES_H

 # include <inttypes.h>

 #endif

-#ifdef HAVE_STDINT_H

+#if HAVE_STDINT_H

 # include <stdint.h>

 #endif

-#ifdef HAVE_UNISTD_H

+#if HAVE_UNISTD_H

 # include <unistd.h>

 #endif"

@@ -1576,7 +1576,7 @@ test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

 configure

-generated by GNU Autoconf 2.60a

+generated by GNU Autoconf 2.60

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

@@ -1590,7 +1590,7 @@ This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

 It was created by $as_me, which was

-generated by GNU Autoconf 2.60a.  Invocation command line was

+generated by GNU Autoconf 2.60.  Invocation command line was

   $ $0 $@

@@ -3164,7 +3164,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

 # in a Makefile.  We should not override ac_cv_exeext if it was cached,

 # so that the user can short-circuit this test for compilers unknown to

 # Autoconf.

-for ac_file in $ac_files ''

+for ac_file in $ac_files

 do

   test -f "$ac_file" || continue

   case $ac_file in

@@ -3192,12 +3192,6 @@ done

 test "$ac_cv_exeext" = no && ac_cv_exeext=

 else

-  ac_file=''

-fi

-

-{ echo "$as_me:$LINENO: result: $ac_file" >&5

-echo "${ECHO_T}$ac_file" >&6; }

-if test -z "$ac_file"; then

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

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

@@ -3209,6 +3203,8 @@ See \`config.log' for more details." >&2;}

 fi

 ac_exeext=$ac_cv_exeext

+{ echo "$as_me:$LINENO: result: $ac_file" >&5

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

 # Check that the compiler produces executables we can run.  If not, either

 # the compiler is broken, or we cross compile.

@@ -5886,7 +5882,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

 case $host in

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 5889 "configure"' > conftest.$ac_ext

+  echo '#line 5885 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -5998,7 +5994,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	lt_cv_cc_needs_belf=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

      ac_ext=c

 ac_cpp='$CPP $CPPFLAGS'

@@ -6474,7 +6470,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

   LDFLAGS="$save_LDFLAGS"

@@ -6519,7 +6515,7 @@ chmod -w .

 save_CFLAGS="$CFLAGS"

 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"

 compiler_c_o=no

-if { (eval echo configure:6522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

+if { (eval echo configure:6518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

   # The compiler can only warn and ignore the option if not recognized

   # So say no if there are warnings

   if test -s out/conftest.err; then

@@ -8080,7 +8076,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_func_shl_load=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

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

@@ -8159,7 +8155,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_dld_shl_load=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8260,7 +8256,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_func_dlopen=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

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

@@ -8339,7 +8335,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_dl_dlopen=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8419,7 +8415,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_svld_dlopen=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8499,7 +8495,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_dld_dld_link=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8555,7 +8551,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 8558 "configure"

+#line 8554 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -8653,7 +8649,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 8656 "configure"

+#line 8652 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10427,7 +10423,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_socket_bind=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -10508,7 +10504,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_nsl_gethostent=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -10626,7 +10622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_var=no"

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_var'}'`

@@ -10901,7 +10897,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_var=no"

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_var'}'`

@@ -10958,21 +10954,21 @@ $ac_includes_default

 #include <fcntl.h>

 #include <sys/mman.h>

-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H

+#if !STDC_HEADERS && !HAVE_STDLIB_H

 char *malloc ();

 #endif

 /* This mess was copied from the GNU getpagesize.h.  */

-#ifndef HAVE_GETPAGESIZE

+#if !HAVE_GETPAGESIZE

 /* Assume that all systems that can run configure have sys/param.h.  */

-# ifndef HAVE_SYS_PARAM_H

+# if !HAVE_SYS_PARAM_H

 #  define HAVE_SYS_PARAM_H 1

 # endif

 # ifdef _SC_PAGESIZE

 #  define getpagesize() sysconf(_SC_PAGESIZE)

 # else /* no _SC_PAGESIZE */

-#  ifdef HAVE_SYS_PARAM_H

+#  if HAVE_SYS_PARAM_H

 #   include <sys/param.h>

 #   ifdef EXEC_PAGESIZE

 #    define getpagesize() EXEC_PAGESIZE

@@ -11304,7 +11300,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_func_fseeko=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

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

@@ -11700,7 +11696,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_z_inflateEnd=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -11790,7 +11786,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_z_inflateEnd=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -11892,7 +11888,7 @@ 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 \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12150,7 +12146,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_sn_sigscan_sn_sigscan_initdb=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12406,7 +12402,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_resolv___dn_expand=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12488,7 +12484,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_resolv_dn_expand=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12649,7 +12645,7 @@ echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; }

 fi

 if test $ac_cv_header_resolv_h = yes; then

-  FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib";

+  FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $resolv_lib";

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_RESOLV_H 1

 _ACEOF

@@ -12919,7 +12915,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_gmp___gmpz_init=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -13003,7 +12999,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_gmp_mpz_init=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -13910,7 +13906,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_milter_mi_stop=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -13997,7 +13993,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext

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

   break

@@ -14092,7 +14088,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_milter_mi_stop=no

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -14411,7 +14407,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_var=no"

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_var'}'`

@@ -14902,11 +14898,11 @@ echo "${ECHO_T}no" >&6; }

                 LIBS=$save_LIBS

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 else

   have_wrappers=no

@@ -15721,10 +15717,10 @@ main ()

 #ifndef __cplusplus

   /* Ultrix mips cc rejects this.  */

   typedef int charset[2];

-  const charset cs;

+  const charset x;

   /* SunOS 4.1.1 cc rejects this.  */

-  char const *const *pcpcc;

-  char **ppc;

+  char const *const *ccp;

+  char **p;

   /* NEC SVR4.0.2 mips cc rejects this.  */

   struct point {int x, y;};

   static struct point const zero = {0,0};

@@ -15733,11 +15729,11 @@ main ()

      an arm of an if-expression whose if-part is not a constant

      expression */

   const char *g = "string";

-  pcpcc = &g + (g ? g-g : 0);

+  ccp = &g + (g ? g-g : 0);

   /* HPUX 7.0 cc rejects these. */

-  ++pcpcc;

-  ppc = (char**) pcpcc;

-  pcpcc = (char const *const *) ppc;

+  ++ccp;

+  p = (char**) ccp;

+  ccp = (char const *const *) p;

   { /* SCO 3.2v4 cc rejects this.  */

     char *t;

     char const *s = 0 ? (char *) 0 : (char const *) 0;

@@ -15764,7 +15760,7 @@ main ()

     const int foo = 10;

     if (!foo) return 0;

   }

-  return !cs[0] && !zero.x;

+  return !x[0] && !zero.x;

 #endif

   ;

@@ -15929,8 +15925,7 @@ cat >>conftest.$ac_ext <<_ACEOF

 int

 main ()

 {

-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \

-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)

+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN

  bogus endian macros

 #endif

@@ -17028,7 +17023,7 @@ exec 6>&1

 # values after options handling.

 ac_log="

 This file was extended by $as_me, which was

-generated by GNU Autoconf 2.60a.  Invocation command line was

+generated by GNU Autoconf 2.60.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

   CONFIG_HEADERS  = $CONFIG_HEADERS

@@ -17057,7 +17052,7 @@ current configuration.

 Usage: $0 [OPTIONS] [FILE]...

   -h, --help       print this help, then exit

-  -V, --version    print version number and configuration settings, then exit

+  -V, --version    print version number, then exit

   -q, --quiet      do not print progress messages

   -d, --debug      don't remove temporary files

       --recheck    update $as_me by reconfiguring in the same conditions

@@ -17081,7 +17076,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

 config.status

-configured by $0, generated by GNU Autoconf 2.60a,

+configured by $0, generated by GNU Autoconf 2.60,

   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

 Copyright (C) 2006 Free Software Foundation, Inc.

@@ -161,7 +161,7 @@ if test $want_dns = yes; then

     if test -z "$resolv_lib"; then

 	AC_CHECK_LIB(resolv, dn_expand, resolv_lib="-lresolv",)

     fi

-    AC_CHECK_HEADER(resolv.h,[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; AC_DEFINE(HAVE_RESOLV_H,1,have resolv.h)], AC_MSG_WARN([****** DNS support disabled]))

+    AC_CHECK_HEADER(resolv.h,[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $resolv_lib"; AC_DEFINE(HAVE_RESOLV_H,1,have resolv.h)], AC_MSG_WARN([****** DNS support disabled]))

 fi

 AC_ARG_ENABLE(clamuko,