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

+Tue Jul  6 15:15:18 CEST 2004 (tk)

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

+  * configure: improve libmilter test (patch by Tom G. Christensen

+	       <tgc*statsbiblioteket.dk>)

+

 Tue Jul  6 10:37:15 BST 2004 (njh)

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

   * libclamav/mbox.c:	Better handling of Gibe.3 boundary exploit improves

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20040704

+	echo devel-20040706

 	exit 0

 	;;

@@ -102,6 +102,9 @@

 /* in_port_t is defined */

 #undef HAVE_IN_PORT_T

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

+#undef HAVE_LIBMILTER_MFAPI_H

+

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

 #undef HAVE_LIMITS_H

@@ -36,6 +36,6 @@ endif

 endif

 AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"

-LIBS = $(top_builddir)/libclamav/libclamav.la -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@

 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared

 EXTRA_DIST = clamav-milter.c INSTALL

@@ -151,7 +151,7 @@ LDFLAGS = @LDFLAGS@

 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@

 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBOBJS = @LTLIBOBJS@

@@ -1017,7 +1017,7 @@ Optional Features:

   --disable-libtool-lock  avoid locking (might break parallel builds)

   --disable-bzip2	  Disable bzip2 support.

   --disable-clamuko	  Disable clamuko support (Linux and FreeBSD only)

-  --enable-milter	  Build clamav-milter (if milter library found)

+  --enable-milter	  Build clamav-milter

   --disable-dsig	  Disable digital signature support.

   --disable-pthreads      Disable POSIX threads support

   --disable-cr      Don't link with C reentrant library (BSD)

@@ -10323,153 +10323,10 @@ _ACEOF

 fi

-have_milter="no"

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

-  echo "$as_me:$LINENO: checking for libmilter/mfapi.h" >&5

-echo $ECHO_N "checking for libmilter/mfapi.h... $ECHO_C" >&6

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

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

-fi

-echo "$as_me:$LINENO: result: $ac_cv_header_libmilter_mfapi_h" >&5

-echo "${ECHO_T}$ac_cv_header_libmilter_mfapi_h" >&6

-else

-  # Is the header compilable?

-echo "$as_me:$LINENO: checking libmilter/mfapi.h usability" >&5

-echo $ECHO_N "checking libmilter/mfapi.h 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 <libmilter/mfapi.h>

-_ACEOF

-rm -f conftest.$ac_objext

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&

-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; 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 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 libmilter/mfapi.h presence" >&5

-echo $ECHO_N "checking libmilter/mfapi.h 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 <libmilter/mfapi.h>

-_ACEOF

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_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: libmilter/mfapi.h: accepted by the compiler, rejected by the preprocessor!" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: proceeding with the compiler's result" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: proceeding with the compiler's result" >&2;}

-    ac_header_preproc=yes

-    ;;

-  no:yes:* )

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: present but cannot be compiled" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: present but cannot be compiled" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h:     check for missing prerequisite headers?" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h:     check for missing prerequisite headers?" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: see the Autoconf documentation" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: see the Autoconf documentation" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h:     section \"Present But Cannot Be Compiled\"" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: proceeding with the preprocessor's result" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: in the future, the compiler will take precedence" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: in the future, the compiler will take precedence" >&2;}

-    (

-      cat <<\_ASBOX

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

-## Report this to the AC_PACKAGE_NAME lists.  ##

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

-_ASBOX

-    ) |

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

-    ;;

-esac

-echo "$as_me:$LINENO: checking for libmilter/mfapi.h" >&5

-echo $ECHO_N "checking for libmilter/mfapi.h... $ECHO_C" >&6

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

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

-else

-  ac_cv_header_libmilter_mfapi_h=$ac_header_preproc

-fi

-echo "$as_me:$LINENO: result: $ac_cv_header_libmilter_mfapi_h" >&5

-echo "${ECHO_T}$ac_cv_header_libmilter_mfapi_h" >&6

-

-fi

-if test $ac_cv_header_libmilter_mfapi_h = yes; then

-  have_milter="yes"

-fi

-

-

-

 # Check whether --enable-milter or --disable-milter was given.

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

   enableval="$enable_milter"

-

+  have_milter=$enableval

 else

   have_milter="no"

 fi;

@@ -11351,6 +11208,445 @@ esac

+# --enable-milter

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

+    # libmilter checking code adapted from spamass-milter by

+    # Tom G. Christensen <tgc@statsbiblioteket.dk>

+

+    # Check for libmilter and it's header files in the usual locations

+    save_LDFLAGS="$LDFLAGS"

+    if test -d /usr/lib/libmilter ; then

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"

+    fi

+    LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

+    echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5

+echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6

+if test "${ac_cv_lib_milter_mi_stop+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 gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char mi_stop ();

+int

+main ()

+{

+mi_stop ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+  ac_cv_lib_milter_mi_stop=yes

+else

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

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

+

+ac_cv_lib_milter_mi_stop=no

+fi

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

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+echo "$as_me:$LINENO: result: $ac_cv_lib_milter_mi_stop" >&5

+echo "${ECHO_T}$ac_cv_lib_milter_mi_stop" >&6

+if test $ac_cv_lib_milter_mi_stop = yes; then

+  CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter"

+else

+

+	# Older sendmails require libsm or libsmutil for support functions

+	echo "$as_me:$LINENO: checking for library containing strlcpy" >&5

+echo $ECHO_N "checking for library containing strlcpy... $ECHO_C" >&6

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

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

+else

+  ac_func_search_save_LIBS=$LIBS

+ac_cv_search_strlcpy=no

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

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

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char strlcpy ();

+int

+main ()

+{

+strlcpy ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+  ac_cv_search_strlcpy="none required"

+else

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

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

+

+fi

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

+      conftest$ac_exeext conftest.$ac_ext

+if test "$ac_cv_search_strlcpy" = no; then

+  for ac_lib in sm smutil; do

+    LIBS="-l$ac_lib  $ac_func_search_save_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 gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char strlcpy ();

+int

+main ()

+{

+strlcpy ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+  ac_cv_search_strlcpy="-l$ac_lib"

+break

+else

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

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

+

+fi

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

+      conftest$ac_exeext conftest.$ac_ext

+  done

+fi

+LIBS=$ac_func_search_save_LIBS

+fi

+echo "$as_me:$LINENO: result: $ac_cv_search_strlcpy" >&5

+echo "${ECHO_T}$ac_cv_search_strlcpy" >&6

+if test "$ac_cv_search_strlcpy" != no; then

+  test "$ac_cv_search_strlcpy" = "none required" || LIBS="$ac_cv_search_strlcpy $LIBS"

+  test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"

+fi

+

+	LDFLAGS="$save_LDFLAGS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"

+	$as_unset ac_cv_lib_milter_mi_stop

+	echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5

+echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6

+if test "${ac_cv_lib_milter_mi_stop+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 gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char mi_stop ();

+int

+main ()

+{

+mi_stop ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+  ac_cv_lib_milter_mi_stop=yes

+else

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

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

+

+ac_cv_lib_milter_mi_stop=no

+fi

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

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+echo "$as_me:$LINENO: result: $ac_cv_lib_milter_mi_stop" >&5

+echo "${ECHO_T}$ac_cv_lib_milter_mi_stop" >&6

+if test $ac_cv_lib_milter_mi_stop = yes; then

+  CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter $CLAMAV_MILTER_XLIB"

+else

+

+	    { { echo "$as_me:$LINENO: error: Cannot find libmilter" >&5

+echo "$as_me: error: Cannot find libmilter" >&2;}

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

+

+fi

+

+

+fi

+

+    LDFLAGS="$save_LDFLAGS"

+

+for ac_header in libmilter/mfapi.h

+do

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

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

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

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

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

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

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest.$ac_objext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; 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 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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then

+  if test -s conftest.err; then

+    ac_cpp_err=$ac_c_preproc_warn_flag

+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

+  else

+    ac_cpp_err=

+  fi

+else

+  ac_cpp_err=yes

+fi

+if test -z "$ac_cpp_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 the AC_PACKAGE_NAME lists.  ##

+## ------------------------------------------ ##

+_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 eval "test \"\${$as_ac_Header+set}\" = set"; then

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

+else

+  eval "$as_ac_Header=\$ac_header_preproc"

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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

+ have_milter="yes"

+else

+

+	{ { echo "$as_me:$LINENO: error: Please install mfapi.h from the sendmail distribution" >&5

+echo "$as_me: error: Please install mfapi.h from the sendmail distribution" >&2;}

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

+

+fi

+

+done

+

+fi

+

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

@@ -86,12 +86,9 @@ want_clamuko="no",)

 AC_FUNC_SETPGRP

-have_milter="no"

-AC_CHECK_HEADER(libmilter/mfapi.h,have_milter="yes",)

-

 AC_ARG_ENABLE(milter,

-[  --enable-milter	  Build clamav-milter (if milter library found)],

-,have_milter="no")

+[  --enable-milter	  Build clamav-milter],

+have_milter=$enableval,have_milter="no")

 want_dsig="yes"

 AC_ARG_ENABLE(dsig,

@@ -381,6 +378,32 @@ AC_SUBST(FRESHCLAM_LIBS)

 AC_SUBST(TH_SAFE)

 AC_SUBST(ADDITIONAL_LIBS)

+# --enable-milter

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

+    # libmilter checking code adapted from spamass-milter by

+    # Tom G. Christensen <tgc@statsbiblioteket.dk>

+

+    # Check for libmilter and it's header files in the usual locations

+    save_LDFLAGS="$LDFLAGS"

+    if test -d /usr/lib/libmilter ; then

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"

+    fi

+    LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

+    AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter"],[

+	# Older sendmails require libsm or libsmutil for support functions

+	AC_SEARCH_LIBS(strlcpy, [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"])

+	LDFLAGS="$save_LDFLAGS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"

+	$as_unset ac_cv_lib_milter_mi_stop

+	AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter $CLAMAV_MILTER_XLIB"],[

+	    AC_MSG_ERROR([Cannot find libmilter])

+	])

+    ])

+    LDFLAGS="$save_LDFLAGS"

+    AC_CHECK_HEADERS(libmilter/mfapi.h,have_milter="yes",[

+	AC_MSG_ERROR([Please install mfapi.h from the sendmail distribution])

+    ])

+fi

+

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

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