@@ -29,7 +29,7 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav --enable-distcheck-werror --enable-all-jit-targets --enable-llvm=yes

+DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes

 lcov:

 	($(MAKE); cd unit_tests; $(MAKE) lcov)

 quick-check:

@@ -352,7 +352,7 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-distcheck-werror --enable-all-jit-targets --enable-llvm=yes

+DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -28,9 +28,6 @@

 ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 #####

-# ClamAV: filter -Werror here

-CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`

-

 ACLOCAL_AMFLAGS = -I m4

 AUTOMAKE_OPTIONS = foreign

 AM_CPPFLAGS =

@@ -140,6 +137,12 @@ CLEANFILES		       += libltdl.la \

 CLEANFILES	       += $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)

 EXTRA_DIST	       += COPYING.LIB \

+			   \

+			   \

+			   \

+			   \

+			   \

+			   \

 			  README

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

@@ -154,7 +157,6 @@ EXTRA_DIST	+= argz_.h \

 # doesn't have one that works with the given compiler.

 all-local $(lib_OBJECTS): $(ARGZ_H)

 argz.h: argz_.h

-	$(mkinstalldirs) . 

 	cp $(srcdir)/argz_.h $@-t

 	mv $@-t $@

 MOSTLYCLEANFILES += argz.h \

@@ -201,9 +201,7 @@ BUILD_CONFIGURE_FLAGS = @BUILD_CONFIGURE_FLAGS@

 CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

-

-# ClamAV: filter -Werror here

-CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`

+CFLAGS = @CFLAGS@

 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@

 CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

@@ -962,7 +960,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \

 # doesn't have one that works with the given compiler.

 all-local $(lib_OBJECTS): $(ARGZ_H)

 argz.h: argz_.h

-	$(mkinstalldirs) . 

 	cp $(srcdir)/argz_.h $@-t

 	mv $@-t $@