Browse code

0.100.1 - fixing segfault caused by a linking order issue which occurred when updating to a newer version of clam, patch by Tom Judge

Mickey Sola authored on 2018/06/27 03:29:50
Showing 2 changed files
... ...
@@ -44,7 +44,7 @@ endif
44 44
 
45 45
 
46 46
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
47
-AM_CPPFLAGS = @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@
47
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
48 48
 LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @CLAMDSCAN_LIBS@
49 49
 
50 50
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
... ...
@@ -508,7 +508,7 @@ top_srcdir = @top_srcdir@
508 508
 @BUILD_CLAMD_TRUE@    client.h
509 509
 
510 510
 @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
511
-AM_CPPFLAGS = @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@
511
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
512 512
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)
513 513
 CLEANFILES = *.gcda *.gcno
514 514
 all: all-am