@@ -281,6 +281,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -21,9 +21,6 @@

 /* enable clamuko */

 #undef CLAMUKO

-/* enable loading of unsigned bytecode */

-#undef CL_BCUNSIGNED

-

 /* enable debugging */

 #undef CL_DEBUG

@@ -175,6 +172,9 @@

 /* Define if you have the _dyld_func_lookup function. */

 #undef HAVE_DYLD

+/* Define to 1 if you have the `enable_extended_FILE_stdio' function. */

+#undef HAVE_ENABLE_EXTENDED_FILE_STDIO

+

 /* Define to 1 if the system has the type `error_t'. */

 #undef HAVE_ERROR_T

@@ -167,7 +167,7 @@ BUILD_CONFIGURE_FLAGS = @BUILD_CONFIGURE_FLAGS@

 CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

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

+CFLAGS = @CFLAGS@

 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@

 CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

@@ -255,6 +255,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -335,6 +337,7 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    clamav-milter.c

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

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@

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

 CLEANFILES = *.gcda *.gcno

 all: all-am

@@ -197,6 +197,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -266,6 +268,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

 CLEANFILES = *.gcda *.gcno

 all: all-am

@@ -215,6 +215,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -284,6 +286,7 @@ clamconf_SOURCES = \

     $(top_srcdir)/shared/misc.h \

     clamconf.c

+AM_CFLAGS = @WERR_CFLAGS@

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

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

 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\

@@ -233,6 +233,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -331,6 +333,7 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@    dazukofs.h \

 @BUILD_CLAMD_TRUE@    shared.h

+@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@

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

 # it does support --help and --version but with the default config file

@@ -226,6 +226,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -305,6 +307,7 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@    client.c \

 @BUILD_CLAMD_TRUE@    client.h

+@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@

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

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)

 CLEANFILES = *.gcda *.gcno

@@ -226,6 +226,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -296,6 +298,7 @@ top_srcdir = @top_srcdir@

 @HAVE_CURSES_TRUE@    $(top_srcdir)/shared/misc.h \

 @HAVE_CURSES_TRUE@    clamdtop.c

+@HAVE_CURSES_TRUE@AM_CFLAGS = @WERR_CFLAGS@

 @HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@

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

 EXTRA_DIST = clamdtop.c

@@ -217,6 +217,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -293,6 +295,7 @@ clamscan_SOURCES = \

     manager.c \

     manager.h

+AM_CFLAGS = @WERR_CFLAGS@

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

 CLEANFILES = *.gcda *.gcno

 all: all-am

@@ -755,6 +755,8 @@ am__EXEEXT_TRUE

 LTLIBOBJS

 LIBOBJS

 subdirs

+WERR_CFLAGS_MILTER

+WERR_CFLAGS

 HAVE_CURSES_FALSE

 HAVE_CURSES_TRUE

 CURSES_LIBS

@@ -17271,6 +17273,18 @@ $as_echo "#define _REENTRANT 1" >>confdefs.h

 fi

+for ac_func in enable_extended_FILE_stdio

+do :

+  ac_fn_c_check_func "$LINENO" "enable_extended_FILE_stdio" "ac_cv_func_enable_extended_FILE_stdio"

+if test "x$ac_cv_func_enable_extended_FILE_stdio" = x""yes; then :

+  cat >>confdefs.h <<_ACEOF

+#define HAVE_ENABLE_EXTENDED_FILE_STDIO 1

+_ACEOF

+

+fi

+done

+

+

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readdir_r" >&5

 $as_echo_n "checking for readdir_r... " >&6; }

@@ -20002,12 +20016,18 @@ fi

 # 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

+

+

 # Check whether --enable-llvm was given.

 if test "${enable_llvm+set}" = set; then :

   enableval=$enable_llvm; enable_llvm=$enableval

@@ -183,6 +183,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -210,6 +210,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -182,6 +182,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -219,6 +219,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -308,6 +310,7 @@ freshclam_SOURCES = \

     mirman.c \

     mirman.h

+AM_CFLAGS = @WERR_CFLAGS@

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

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)

 CLEANFILES = *.gcda *.gcno

@@ -467,6 +467,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -529,6 +531,7 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

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

 	$(am__append_1)

+AM_CFLAGS = @WERR_CFLAGS@

 lib_LTLIBRARIES = $(am__append_3) libclamav.la

 EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) regex/engine.c \

 	libclamav.map jsparse/generated/operators.h \

@@ -586,7 +589,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\

 				    md5.c\

@@ -606,7 +609,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

 @ENABLE_LLVM_FALSE@LLVMLIBADD = libclamav_nocxx.la

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

 @ENABLE_LLVM_FALSE@LLVMDEP = libclamav_nocxx.la

@@ -615,7 +618,7 @@ libclamav_internal_utils_nothreads_la_CFLAGS = -DCL_NOTHREADS

 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 $(am__append_6)

 include_HEADERS = clamav.h

@@ -291,6 +291,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -216,6 +216,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -293,6 +295,7 @@ sigtool_SOURCES = \

     vba.h \

     sigtool.c

+AM_CFLAGS = @WERR_CFLAGS@

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

 CLEANFILES = *.gcda *.gcno

 all: all-am

@@ -164,6 +164,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -307,6 +307,8 @@ THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

+WERR_CFLAGS = @WERR_CFLAGS@

+WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@

 abs_builddir = @abs_builddir@

 abs_srcdir = @abs_srcdir@

 abs_top_builddir = @abs_top_builddir@

@@ -376,6 +378,7 @@ scripts = check_freshclam.sh check_sigtool.sh check_unit_vg.sh check1_clamscan.s

 TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK); \

 	$(am__append_1)

 check_SCRIPTS = $(scripts)

+AM_CFLAGS = @WERR_CFLAGS@

 @HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c

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

 @HAVE_LIBCHECK_TRUE@		       check_jsnorm.c check_str.c check_regex.c\

@@ -23,9 +23,6 @@

 /* enable clamuko */

 /* #undef CLAMUKO */

-/* enable loading of unsigned bytecode */

-/* #undef CL_BCUNSIGNED */

-

 /* enable debugging */

 /* #undef CL_DEBUG */

@@ -177,6 +174,9 @@

 /* Define if you have the _dyld_func_lookup function. */

 /* #undef HAVE_DYLD */

+/* Define to 1 if you have the `enable_extended_FILE_stdio' function. */

+/* #undef HAVE_ENABLE_EXTENDED_FILE_STDIO */

+

 /* Define to 1 if the system has the type `error_t'. */

 /* #undef HAVE_ERROR_T */

@@ -502,7 +502,7 @@

 /* #undef USE_SYSLOG */

 /* Version number of package */

-#define VERSION "clamav-0.97"

+#define VERSION "devel-clamav-0.97-71-gb9734ed"

 /* Version suffix for package */

 #define VERSION_SUFFIX ""