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

+Sun Dec  7 16:17:33 CET 2008 (acab)

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

+ * configure, m4/resolv.m4: remove stale checks

+

 Sun Dec  7 15:28:42 CET 2008 (acab)

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

  * clamav-milter: enable building on OpenBSD...

@@ -269,7 +269,6 @@ prefix = @prefix@

 program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

-sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

 srcdir = @srcdir@

 sys_symbol_underscore = @sys_symbol_underscore@

@@ -232,9 +232,6 @@

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

 #undef HAVE_LIMITS_H

-/* Define to 1 if -lresolv provides thread safe API's like res_nquery */

-#undef HAVE_LRESOLV_R

-

 /* Define this if a modern libltdl is already installed */

 #undef HAVE_LTDL

@@ -377,9 +374,6 @@

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

 #undef HAVE_SYS_UIO_H

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

-#undef HAVE_TCPD_H

-

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

 #undef HAVE_TERMIOS_H

@@ -448,18 +442,6 @@

 /* scan buffer size */

 #undef SCANBUFF

-/* location of Sendmail binary */

-#undef SENDMAIL_BIN

-

-/* major version of Sendmail */

-#undef SENDMAIL_VERSION_A

-

-/* minor version of Sendmail */

-#undef SENDMAIL_VERSION_B

-

-/* subversion of Sendmail */

-#undef SENDMAIL_VERSION_C

-

 /* Define to 1 if the `setpgrp' function takes no argument. */

 #undef SETPGRP_VOID

@@ -496,9 +478,6 @@

 /* Version suffix for package */

 #undef VERSION_SUFFIX

-/* tcpwrappers support */

-#undef WITH_TCPWRAP

-

 /* endianess */

 #undef WORDS_BIGENDIAN

@@ -258,7 +258,6 @@ prefix = @prefix@

 program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

-sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

 srcdir = @srcdir@

 sys_symbol_underscore = @sys_symbol_underscore@

@@ -237,7 +237,6 @@ prefix = @prefix@

 program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

-sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

 srcdir = @srcdir@

 sys_symbol_underscore = @sys_symbol_underscore@

@@ -257,7 +257,6 @@ prefix = @prefix@

 program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

-sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

 srcdir = @srcdir@

 sys_symbol_underscore = @sys_symbol_underscore@

@@ -248,7 +248,6 @@ prefix = @prefix@

 program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

-sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

 srcdir = @srcdir@

 sys_symbol_underscore = @sys_symbol_underscore@

@@ -239,7 +239,6 @@ prefix = @prefix@

 program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

-sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

 srcdir = @srcdir@

 sys_symbol_underscore = @sys_symbol_underscore@

@@ -927,7 +927,6 @@ CLAMAV_MILTER_LIBS

 FRESHCLAM_LIBS

 TH_SAFE

 THREAD_LIBS

-sendmailprog

 BUILD_CLAMD_TRUE

 BUILD_CLAMD_FALSE

 HAVE_MILTER_TRUE

@@ -1591,9 +1590,6 @@ Optional Packages:

   --with-user=uid	  name of the clamav user (default=clamav)

   --with-group=gid	  name of the clamav group (default=clamav)

   --with-dbdir=path	  path to virus database directory

-  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)

-  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)

-  --with-tcpwrappers      support hosts.allow / hosts.deny (default=auto)

 Some influential environment variables:

   CC          C compiler command

@@ -4789,13 +4785,13 @@ if test "${lt_cv_nm_interface+set}" = set; then

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:4792: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:4788: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4795: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:4791: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4798: output\"" >&5)

+  (eval echo "\"\$as_me:4794: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -6006,7 +6002,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

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

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

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

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7856,11 +7852,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7859: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7855: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7863: \$? = $ac_status" >&5

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

    if (exit $ac_status) && test -s "$ac_outfile"; then

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

      # So say no if there are warnings other than the usual output.

@@ -8195,11 +8191,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8198: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8194: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8202: \$? = $ac_status" >&5

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

    if (exit $ac_status) && test -s "$ac_outfile"; then

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

      # So say no if there are warnings other than the usual output.

@@ -8300,11 +8296,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8303: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8299: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8307: \$? = $ac_status" >&5

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

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

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

@@ -8355,11 +8351,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8358: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8362: \$? = $ac_status" >&5

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

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

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

@@ -11111,7 +11107,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11114 "configure"

+#line 11110 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11207,7 +11203,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11210 "configure"

+#line 11206 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -12322,7 +12318,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 12325 "configure"

+#line 12321 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -19133,72 +19129,11 @@ fi

     if test "x$ac_cv_have_lresolv" != "xno"; then

     	FRESHCLAM_LIBS="$FRESHCLAM_LIBS$ac_cv_have_lresolv"

-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS$ac_cv_have_lresolv"

-	bklibs=$LIBS

-	LIBS=$ac_cv_have_lresolv

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_RESOLV_H 1

 _ACEOF

-	{ echo "$as_me:$LINENO: checking for res_nquery in -lresolv" >&5

-echo $ECHO_N "checking for res_nquery in -lresolv... $ECHO_C" >&6; }

-if test "${ac_cv_have_lresolv_r+set}" = set; then

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

-else

-

-	    ac_cv_have_lresolv_r='no'

-	    cat >conftest.$ac_ext <<_ACEOF

-

-#include <sys/types.h>

-#include <netinet/in.h>

-#include <arpa/nameser.h>

-#include <resolv.h>

-int main() { return (long)res_nquery; }

-

-_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_have_lresolv_r='yes'

-

-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,

-

-fi

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

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

-	LIBS=$bklibs

-	if test "x$ac_cv_have_lresolv_r" = "xyes"; then

-

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_LRESOLV_R 1

-_ACEOF

-

-	fi

     else

 	{ echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5

 echo "$as_me: WARNING: ****** DNS support disabled" >&2;}

@@ -21242,181 +21177,6 @@ done

 fi

-if test "$have_milter" = "yes"; then

-  sendmailprog=no

-

-# Check whether --with-sendmail was given.

-if test "${with_sendmail+set}" = set; then

-  withval=$with_sendmail; sendmailprog=$with_sendmail

-else

-  sendmailprog=no

-fi

-

-

-  if test "$sendmailprog" = "no" ; then

-    # Extract the first word of "sendmail", so it can be a program name with args.

-set dummy sendmail; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

-if test "${ac_cv_path_sendmailprog+set}" = set; then

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

-else

-  case $sendmailprog in

-  [\\/]* | ?:[\\/]*)

-  ac_cv_path_sendmailprog="$sendmailprog" # Let the user override the test with a path.

-  ;;

-  *)

-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-as_dummy="$PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec"

-for as_dir in $as_dummy

-do

-  IFS=$as_save_IFS

-  test -z "$as_dir" && as_dir=.

-  for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

-    ac_cv_path_sendmailprog="$as_dir/$ac_word$ac_exec_ext"

-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

-    break 2

-  fi

-done

-done

-IFS=$as_save_IFS

-

-  test -z "$ac_cv_path_sendmailprog" && ac_cv_path_sendmailprog="no"

-  ;;

-esac

-fi

-sendmailprog=$ac_cv_path_sendmailprog

-if test -n "$sendmailprog"; then

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

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

-else

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

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

-fi

-

-

-  fi

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_BIN "$sendmailprog"

-_ACEOF

-

-

-

-# Check whether --with-sendmail-version was given.

-if test "${with_sendmail_version+set}" = set; then

-  withval=$with_sendmail_version; sendmailvers=$with_sendmail_version

-else

-  sendmailvers=no

-fi

-

-

-  if test "$sendmailvers" = "no" ; then

-    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

-  fi

-

-  if test -z "$sendmailver"; then

-	# example: postfix

-	LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

-	{ echo "$as_me:$LINENO: checking for smfi_opensocket in -lmilter" >&5

-echo $ECHO_N "checking for smfi_opensocket in -lmilter... $ECHO_C" >&6; }

-if test "${ac_cv_lib_milter_smfi_opensocket+set}" = set; then

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

-else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-lmilter  $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 smfi_opensocket ();

-int

-main ()

-{

-return smfi_opensocket ();

-  ;

-  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_milter_smfi_opensocket=yes

-else

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

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

-

-	ac_cv_lib_milter_smfi_opensocket=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_milter_smfi_opensocket" >&5

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

-if test $ac_cv_lib_milter_smfi_opensocket = yes; then

-  sendmailver="8.13.0"

-else

-  { echo "$as_me:$LINENO: WARNING: cannot determine sendmail version" >&5

-echo "$as_me: WARNING: cannot determine sendmail version" >&2;}

-fi

-

-	LDFLAGS="$save_LDFLAGS"

-  fi

-  if test -n "$sendmailver"; then

-    sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

-    sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`

-    sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_VERSION_A $sendmailver_a

-_ACEOF

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_VERSION_B $sendmailver_b

-_ACEOF

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_VERSION_C $sendmailver_c

-_ACEOF

-

-  fi

-  if test "x$ac_cv_have_lresolv_r" != "xyes"; then

-    { echo "$as_me:$LINENO: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&5

-echo "$as_me: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&2;}

-  fi

-fi

-

  if test "$have_pthreads" = "yes"; then

   BUILD_CLAMD_TRUE=

   BUILD_CLAMD_FALSE='#'

@@ -21541,309 +21301,6 @@ _ACEOF

 fi

-

-# Check whether --with-tcpwrappers was given.

-if test "${with_tcpwrappers+set}" = set; then

-  withval=$with_tcpwrappers;  case "$withval" in

-  yes|no) tcpw="$withval" ;;

-  *)      { { echo "$as_me:$LINENO: error: --with-tcpwrappers does not take an argument" >&5

-echo "$as_me: error: --with-tcpwrappers does not take an argument" >&2;}

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

-  esac

-else

-   tcpw=auto

-fi

-

-

-if test "$tcpw" != "no" && test "$have_milter" = "yes" ; then

-

-for ac_header in tcpd.h

-do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

-  { echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

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

-fi

-ac_res=`eval echo '${'$as_ac_Header'}'`

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

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

-else

-  # Is the header compilable?

-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-$ac_includes_default

-#include <$ac_header>

-_ACEOF

-rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"

-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_compile") 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_objext; then

-  ac_header_compiler=yes

-else

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

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

-

-	ac_header_compiler=no

-fi

-

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

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

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

-

-# Is the header present?

-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-#include <$ac_header>

-_ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"

-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_cpp conftest.$ac_ext") 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); } >/dev/null && {

-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       }; then

-  ac_header_preproc=yes

-else

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

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

-

-  ac_header_preproc=no

-fi

-

-rm -f conftest.err conftest.$ac_ext

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

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

-

-# So?  What about this header?

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

-  yes:no: )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

-    ac_header_preproc=yes

-    ;;

-  no:yes:* )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5

-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5

-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

-    ( cat <<\_ASBOX

-## -------------------------------------- ##

-## Report this to http://bugs.clamav.net/ ##

-## -------------------------------------- ##

-_ASBOX

-     ) | sed "s/^/$as_me: WARNING:     /" >&2

-    ;;

-esac

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

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

-else

-  eval "$as_ac_Header=\$ac_header_preproc"

-fi

-ac_res=`eval echo '${'$as_ac_Header'}'`

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

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

-

-fi

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

-_ACEOF

-

-                { echo "$as_me:$LINENO: checking for TCP wrappers library" >&5

-echo $ECHO_N "checking for TCP wrappers library... $ECHO_C" >&6; }

-                save_LIBS="$LIBS"

-                LIBS="$LIBS -lwrap $FRESHCLAM_LIBS"

-                cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-#ifdef HAVE_SYS_TYPES_H

-#include <sys/types.h>

-#endif

-#include <tcpd.h>

-int allow_severity = 0;

-int deny_severity  = 0;

-

-struct request_info *req;

-

-int

-main ()

-{

-

-hosts_access(req)

-

-  ;

-  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

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

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

-                have_wrappers=yes

-		LIBS="$save_LIBS"

-                CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"

-else

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

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

-

-

-                                LIBS="$LIBS -lnsl $FRESHCLAM_LIBS"

-                cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-#ifdef HAVE_SYS_TYPES_H

-#include <sys/types.h>

-#endif

-#include <tcpd.h>

-int allow_severity = 0;

-int deny_severity  = 0;

-

-struct request_info *req;

-

-int

-main ()

-{

-

-hosts_access(req)

-

-  ;

-  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

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

-echo "${ECHO_T}-lwrap -lnsl" >&6; }

-                have_wrappers=yes

-                CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"

-else

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

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

-

-

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

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

-                have_wrappers=no

-                LIBS=$save_LIBS

-fi

-

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

-      conftest$ac_exeext conftest.$ac_ext

-fi

-

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

-      conftest$ac_exeext conftest.$ac_ext

-else

-  have_wrappers=no

-fi

-

-done

-

-

-        if test $have_wrappers = yes ; then

-

-cat >>confdefs.h <<\_ACEOF

-#define WITH_TCPWRAP 1

-_ACEOF

-

-        elif test $tcpw = yes ; then

-                { { echo "$as_me:$LINENO: error: could not find TCP wrappers" >&5

-echo "$as_me: error: could not find TCP wrappers" >&2;}

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

-        else

-                { echo "$as_me:$LINENO: WARNING: could not find TCP wrappers, support disabled" >&5

-echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;}

-        fi

-fi

-

 { echo "$as_me:$LINENO: checking for gethostbyname_r" >&5

 echo $ECHO_N "checking for gethostbyname_r... $ECHO_C" >&6; }

 if test -z "$ac_cv_gethostbyname_args"; then

@@ -24780,7 +24237,6 @@ CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$ac_delim

 FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim

 TH_SAFE!$TH_SAFE$ac_delim

 THREAD_LIBS!$THREAD_LIBS$ac_delim

-sendmailprog!$sendmailprog$ac_delim

 BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim

 BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim

 HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim

@@ -24794,7 +24250,7 @@ ltdl_LIBOBJS!$ltdl_LIBOBJS$ac_delim

 ltdl_LTLIBOBJS!$ltdl_LTLIBOBJS$ac_delim

 _ACEOF

-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then

+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then

     break

   elif $ac_last_try; then

     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

@@ -1133,47 +1133,6 @@ if test "$have_milter" = "yes"; then

     ])

 fi

-if test "$have_milter" = "yes"; then

-  sendmailprog=no

-  AC_ARG_WITH([sendmail],

-  [  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)],

-  sendmailprog=$with_sendmail, sendmailprog=no)

-

-  if test "$sendmailprog" = "no" ; then

-    AC_PATH_PROG([sendmailprog], sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)

-  fi

-

-  AC_DEFINE_UNQUOTED([SENDMAIL_BIN], "$sendmailprog", [location of Sendmail binary])

-

-  AC_ARG_WITH(sendmail-version,

-  [  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)],

-  sendmailvers=$with_sendmail_version, sendmailvers=no)

-

-  if test "$sendmailvers" = "no" ; then

-    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

-  fi

-

-  if test -z "$sendmailver"; then

-	# example: postfix

-	LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

-	AC_CHECK_LIB([milter],[smfi_opensocket],[sendmailver="8.13.0"],

-		     [AC_MSG_WARN([cannot determine sendmail version])])

-	LDFLAGS="$save_LDFLAGS"

-  fi

-  if test -n "$sendmailver"; then

-    sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

-    sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`

-    sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`

-

-    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])

-    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])

-    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])

-  fi

-  if test "x$ac_cv_have_lresolv_r" != "xyes"; then

-    AC_MSG_WARN([****** Your libresolv is not thread safe, SPF queries in clamav-milter will block])

-  fi

-fi

-

 AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])

 AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])

@@ -1186,66 +1145,6 @@ then

     AC_DEFINE([BUILD_CLAMD], 1, "build clamd")

 fi

-dnl tcpwrappers support

-dnl rules from http://ma.ph-freiburg.de/tng/tng-technical/2002-01/msg00094.html

-AC_ARG_WITH([tcpwrappers],

-[  --with-tcpwrappers      support hosts.allow / hosts.deny (default=auto)],

-[ case "$withval" in

-  yes|no) tcpw="$withval" ;;

-  *)      AC_MSG_ERROR([--with-tcpwrappers does not take an argument]) ;;