Fix errors from make distcheck.

libclamav/Makefile.am

@@ -287,7 +287,8 @@ libclamav_la_SOURCES = \
 	sha256.h\
 	bignum.h\
 	bytecode.c\
-	bytecode.h
+	bytecode.h\
+	clambc.h
 
 if !LINK_TOMMATH
 libclamav_la_SOURCES += bignum.c \

libclamav/Makefile.in

@@ -121,7 +121,7 @@ am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \
 	textnorm.h dlp.c dlp.h jsparse/js-norm.c jsparse/js-norm.h \
 	jsparse/lexglobal.h jsparse/textbuf.h uniq.c uniq.h version.c \
 	version.h mpool.c mpool.h default.h sha256.c sha256.h bignum.h \
-	bytecode.c bytecode.h bignum.c bignum_class.h
+	bytecode.c bytecode.h clambc.h bignum.c bignum_class.h
 @LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo
 am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
 	libclamav_la-matcher-bm.lo libclamav_la-matcher.lo \
@@ -529,7 +529,8 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \
 	explode.h textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \
 	jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \
 	uniq.h version.c version.h mpool.c mpool.h default.h sha256.c \
-	sha256.h bignum.h bytecode.c bytecode.h $(am__append_7)
+	sha256.h bignum.h bytecode.c bytecode.h clambc.h \
+	$(am__append_7)
 noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la
 COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno
 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf

libclamav/bytecode.c

@@ -111,7 +111,7 @@ static inline uint64_t readNumber(const unsigned char *p, unsigned *off, unsigne
     for (i=*off+1;i < newoff; i++) {
 	uint64_t v = p[i];
 	if (UNLIKELY((v&0xf0) != 0x60)) {
-	    cli_errmsg("Invalid number part: %c\n", v);
+	    cli_errmsg("Invalid number part: %c\n", (char)v);
 	    *ok = 0;
 	    return 0;
 	}
@@ -247,8 +247,8 @@ static int parseHeader(struct cli_bc *bc, unsigned char *buffer)
     magic1 = readNumber(buffer, &offset, len, &ok);
     magic2 = readFixedNumber(buffer, &offset, len, &ok, 2);
     if (!ok || magic1 != 0x53e5493e9f3d1c30ull || magic2 != 42) {
-      unsigned m0 = magic1 >> 32;
-      unsigned m1 = magic1;
+      unsigned long m0 = magic1 >> 32;
+      unsigned long m1 = magic1;
       cli_errmsg("Magic numbers don't match: %lx%lx, %u\n", m0, m1, magic2);
       return CL_EMALFDB;
     }

libltdl/Makefile.am

@@ -28,6 +28,9 @@
 ## 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 =

libltdl/Makefile.in

@@ -163,7 +163,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFGDIR = @CFGDIR@
-CFLAGS = @CFLAGS@
+
+# ClamAV: filter -Werror here
+CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
 CHECK_LIBS = @CHECK_LIBS@
 CLAMAVGROUP = @CLAMAVGROUP@