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

+Sat Feb 10 17:47:36 CET 2007 (tk)

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

+  * configure.in: fix bb#267, patch from Edwin

+

 Sat Feb 10 15:44:33 CET 2007 (tk)

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

   * freshclam/manager.c: don't blacklist mirrors for error 404

@@ -23394,9 +23394,12 @@ esac

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

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

+        save_LDFLAGS="$LDFLAGS"

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

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

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

     fi

+    LDFLAGS="$LDFLAGS -lmilter $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

@@ -23545,6 +23548,7 @@ if test "$ac_res" != no; then

   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; }

@@ -23620,6 +23624,7 @@ fi

 fi

+    LDFLAGS="$save_LDFLAGS"

 for ac_header in libmilter/mfapi.h

 do

@@ -597,17 +597,22 @@ if test "$have_milter" = "yes"; then

     dnl Tom G. Christensen <tgc@statsbiblioteket.dk>

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

+    save_LDFLAGS="$LDFLAGS"

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

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

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

     fi

+    LDFLAGS="$LDFLAGS -lmilter $CLAMAV_MILTER_LIBS"

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

 	dnl 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="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"],[

 	    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])

     ])