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

+Fri Oct  3 18:55:37 EEST 2008 (edwin)

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

+  * configure.in: fix build failure when using LDFLAGS="-Wl,--as-needed" (bb  #1204)

+		  thanks to Nathan Brink <ohnobinki*ohnopublishing.net>

+

 Fri Oct  3 15:49:17 CEST 2008 (acab)

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

   * clamav-milter/clamav-milter.c: reopen log files on USR1 instead of HUP

@@ -18262,12 +18262,12 @@ esac

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

-        save_LDFLAGS="$LDFLAGS"

-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

+        save_LIBS="$LIBS"

+    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"

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

@@ -18416,7 +18416,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"

+	LIBS="$save_LIBS $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; }

@@ -18492,7 +18492,7 @@ fi

 fi

-    LDFLAGS="$save_LDFLAGS"

+    LIBS="$save_LIBS"

 for ac_header in libmilter/mfapi.h

 do

@@ -981,22 +981,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"

+    save_LIBS="$LIBS"

+    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"

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

+	LIBS="$save_LIBS $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"

+    LIBS="$save_LIBS"

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

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

     ])