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

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -203,6 +203,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -139,6 +139,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -157,6 +157,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -170,6 +170,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -168,6 +168,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -174,6 +174,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -159,6 +159,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -29,7 +29,7 @@ clamsubmit_SOURCES = \

     $(top_srcdir)/shared/misc.h \

 	clamsubmit.c

-AM_CFLAGS=@WERR_CFLAGS@

+AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@

 DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@

@@ -157,6 +157,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -315,7 +316,7 @@ clamsubmit_SOURCES = \

     $(top_srcdir)/shared/misc.h \

 	clamsubmit.c

-AM_CFLAGS = @WERR_CFLAGS@

+AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT)

 CLEANFILES = *.gcda *.gcno

@@ -659,6 +659,7 @@ HAVE_MILTER_FALSE

 HAVE_MILTER_TRUE

 BUILD_CLAMD_FALSE

 BUILD_CLAMD_TRUE

+CLAMSUBMIT_CFLAGS

 CLAMSUBMIT_LIBS

 THREAD_LIBS

 TH_SAFE

@@ -17030,7 +17031,7 @@ fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5

 $as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }

 if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then :

-  curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS"

+  curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"

 else

   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs." >&5

 $as_echo "$as_me: WARNING: Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs." >&2;}

@@ -18115,6 +18116,7 @@ esac

+

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

         save_LIBS="$LIBS"

@@ -687,7 +687,7 @@ else

     save_LDFLAGS="$LDFLAGS"

     LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"

-    AC_CHECK_LIB([curl], [curl_easy_init], [curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS"],

+    AC_CHECK_LIB([curl], [curl_easy_init], [curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"],

             [AC_MSG_WARN([Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs.])])

 fi

@@ -1242,6 +1242,7 @@ AC_SUBST([CLAMDSCAN_LIBS])

 AC_SUBST([TH_SAFE])

 AC_SUBST([THREAD_LIBS])

 AC_SUBST([CLAMSUBMIT_LIBS])

+AC_SUBST([CLAMSUBMIT_CFLAGS])

 dnl --enable-milter

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

@@ -125,6 +125,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -158,6 +158,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -155,6 +155,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -161,6 +161,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -431,6 +431,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

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

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -158,6 +158,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -107,6 +107,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -298,6 +298,7 @@ CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@

 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@