@@ -40,12 +40,12 @@ clamav_milter_SOURCES = \

     clamfi.h \

     clamav-milter.c

 man_MANS = $(top_builddir)/docs/man/clamav-milter.8

+AM_CFLAGS=@WERR_CFLAGS_MILTER@

 endif

 endif

 DEFS = @DEFS@ -DCL_NOLIBCLAMAV

-CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`

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

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

 CLEANFILES=*.gcda *.gcno

@@ -8,6 +8,7 @@ clambc_SOURCES = \

     $(top_srcdir)/shared/misc.h \

     bcrun.c

+AM_CFLAGS=@WERR_CFLAGS@

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

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

 CLEANFILES=*.gcda *.gcno

@@ -27,6 +27,8 @@ clamconf_SOURCES = \

     $(top_srcdir)/shared/misc.h \

     clamconf.c

+AM_CFLAGS=@WERR_CFLAGS@

+

 DEFS = @DEFS@ -DCL_NOTHREADS

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

 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\

@@ -58,6 +58,8 @@ clamd_SOURCES = \

     dazukofs.h \

     shared.h

+AM_CFLAGS=@WERR_CFLAGS@

+

 endif

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

@@ -38,6 +38,8 @@ clamdscan_SOURCES = \

     proto.h \

     client.c \

     client.h

+

+AM_CFLAGS=@WERR_CFLAGS@

 endif

@@ -10,6 +10,7 @@ clamdtop_SOURCES = \

     $(top_srcdir)/shared/misc.h \

     clamdtop.c

+AM_CFLAGS=@WERR_CFLAGS@

 AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@

 clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la

 endif

@@ -35,6 +35,7 @@ clamscan_SOURCES = \

     manager.c \

     manager.h

+AM_CFLAGS=@WERR_CFLAGS@

 DEFS = @DEFS@ -DCL_NOTHREADS

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

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

@@ -1588,11 +1588,17 @@ AC_ARG_ENABLE([distcheck-werror],

 # Some configure tests fail (like checking for cos in -lm) if we enable these

 # Werror flags for configure too (for example -Wstrict-prototypes makes

 # configure think that -lm doesn't have cos, hence its in libc).

+WERR_CFLAGS=

+WERR_CFLAGS_MILTER=

 if test "x$enable_distcheckwerror" = "xyes"; then

     if test "$distcheck_enable_flags" = "1"; then

-	CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"

+	WERR_COMMON="-Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"

+	WERR_CFLAGS="$WERR_COMMON -Wwrite-strings"

+	WERR_CFLAGS_MILTER="$WERR_COMMON -Wno-error=format-nonliteral"

     fi

 fi

+AC_SUBST([WERR_CFLAGS])

+AC_SUBST([WERR_CFLAGS_MILTER])

 AC_ARG_ENABLE([llvm],AC_HELP_STRING([--enable-llvm],

 				    [Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),

@@ -48,6 +48,7 @@ freshclam_SOURCES = \

     mirman.c \

     mirman.h

+AM_CFLAGS=@WERR_CFLAGS@

 DEFS = @DEFS@ -DCL_NOTHREADS

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

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

@@ -17,6 +17,7 @@

 #  MA 02110-1301, USA.

 AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis $(LTDLINCL)

+AM_CFLAGS=@WERR_CFLAGS@

 lib_LTLIBRARIES =

 EXTRA_DIST = c++/Makefile.nollvm.in

 if ENABLE_UNRAR

@@ -88,7 +89,7 @@ libclamav_internal_utils_la_SOURCES=str.c\

 				    regex/utils.h

 libclamav_internal_utils_la_LDFLAGS=-static

-libclamav_internal_utils_la_CFLAGS=  -fPIC -DPIC

+libclamav_internal_utils_la_CFLAGS=$(AM_CFLAGS)  -fPIC -DPIC

 libclamav_internal_utils_nothreads_la_SOURCES=str.c\

 				    str.h\

@@ -109,7 +110,7 @@ libclamav_internal_utils_nothreads_la_SOURCES=str.c\

 				    regex/utils.h

 libclamav_internal_utils_nothreads_la_LDFLAGS=-static

-libclamav_internal_utils_nothreads_la_CFLAGS=-DCL_NOTHREADS

+libclamav_internal_utils_nothreads_la_CFLAGS=$(AM_CFLAGS) -DCL_NOTHREADS

 if ENABLE_LLVM

 LLVMLIBADD=c++/libclamavcxx.la -lstdc++ -lm

@@ -127,7 +128,7 @@ libclamav_nocxx_la_SOURCES = bytecode_nojit.c

 libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ @LIBM@

 libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la

-libclamav_la_CFLAGS = -DSEARCH_LIBDIR=\"$(libdir)\"

+libclamav_la_CFLAGS =$(AM_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\"

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

 if VERSIONSCRIPT

@@ -17,6 +17,7 @@

 #  MA 02110-1301, USA.

 AM_CPPFLAGS = -I$(top_srcdir) $(LTDLINCL)

+AM_CFLAGS = @WERR_CFLAGS@

 EXTRA_DIST =

 EXTRA_DIST += @top_srcdir@/libclamunrar/libclamunrar.map @top_srcdir@/libclamunrar_iface/libclamunrar_iface.map

 if ENABLE_UNRAR

@@ -35,6 +35,7 @@ sigtool_SOURCES = \

     vba.h \

     sigtool.c

+AM_CFLAGS=@WERR_CFLAGS@

 DEFS = @DEFS@ -DCL_NOTHREADS

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

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

@@ -27,6 +27,7 @@ TESTS = $(programs) $(scripts)

 check_PROGRAMS = $(programs) check_clamd

 check_SCRIPTS = $(scripts)

+AM_CFLAGS=@WERR_CFLAGS@

 if HAVE_LIBCHECK

 check_clamav_SOURCES = check_clamav.c checks.h checks_common.h $(top_builddir)/libclamav/clamav.h\

 		       check_jsnorm.c check_str.c check_regex.c\