Browse code
more fixes for freebsd build with json.
Steven Morgan authored on 2014/04/18 06:15:58Showing 12 changed files
- clamd/Makefile.am
- clamd/Makefile.in
- clamdscan/Makefile.am
- clamdscan/Makefile.in
- clamscan/Makefile.am
- clamscan/Makefile.in
- clamsubmit/Makefile.am
- clamsubmit/Makefile.in
- freshclam/Makefile.am
- freshclam/Makefile.in
- sigtool/Makefile.am
- sigtool/Makefile.in
| ... | ... |
@@ -53,7 +53,7 @@ AM_CFLAGS=@WERR_CFLAGS@ |
| 53 | 53 |
endif |
| 54 | 54 |
|
| 55 | 55 |
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ |
| 56 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 56 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 57 | 57 |
|
| 58 | 58 |
# it does support --help and --version but with the default config file |
| 59 | 59 |
# it outputs an error message which tells us to edit the config files |
| ... | ... |
@@ -403,7 +403,7 @@ top_srcdir = @top_srcdir@ |
| 403 | 403 |
@BUILD_CLAMD_TRUE@ fan.h |
| 404 | 404 |
|
| 405 | 405 |
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ |
| 406 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 406 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 407 | 407 |
|
| 408 | 408 |
# it does support --help and --version but with the default config file |
| 409 | 409 |
# it outputs an error message which tells us to edit the config files |
| ... | ... |
@@ -44,7 +44,7 @@ endif |
| 44 | 44 |
|
| 45 | 45 |
|
| 46 | 46 |
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV |
| 47 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@ |
|
| 47 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_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) |
| ... | ... |
@@ -392,7 +392,7 @@ top_srcdir = @top_srcdir@ |
| 392 | 392 |
@BUILD_CLAMD_TRUE@ client.h |
| 393 | 393 |
|
| 394 | 394 |
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ |
| 395 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@ |
|
| 395 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@ |
|
| 396 | 396 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT) |
| 397 | 397 |
CLEANFILES = *.gcda *.gcno |
| 398 | 398 |
all: all-am |
| ... | ... |
@@ -38,6 +38,6 @@ clamscan_SOURCES = \ |
| 38 | 38 |
AM_CFLAGS=@WERR_CFLAGS@ |
| 39 | 39 |
DEFS = @DEFS@ -DCL_NOTHREADS |
| 40 | 40 |
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CLAMSCAN_LIBS@ |
| 41 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ |
|
| 41 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ |
|
| 42 | 42 |
|
| 43 | 43 |
CLEANFILES=*.gcda *.gcno |
| ... | ... |
@@ -380,7 +380,7 @@ clamscan_SOURCES = \ |
| 380 | 380 |
manager.h |
| 381 | 381 |
|
| 382 | 382 |
AM_CFLAGS = @WERR_CFLAGS@ |
| 383 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ |
|
| 383 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ |
|
| 384 | 384 |
CLEANFILES = *.gcda *.gcno |
| 385 | 385 |
all: all-am |
| 386 | 386 |
|
| ... | ... |
@@ -31,7 +31,7 @@ clamsubmit_SOURCES = \ |
| 31 | 31 |
|
| 32 | 32 |
AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@ |
| 33 | 33 |
DEFS = @DEFS@ -DCL_NOTHREADS |
| 34 |
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 34 |
+AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 35 | 35 |
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ |
| 36 | 36 |
|
| 37 | 37 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamsubmit$(EXEEXT) |
| ... | ... |
@@ -373,7 +373,7 @@ clamsubmit_SOURCES = \ |
| 373 | 373 |
clamsubmit.c |
| 374 | 374 |
|
| 375 | 375 |
AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@ |
| 376 |
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 376 |
+AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
| 377 | 377 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT) |
| 378 | 378 |
CLEANFILES = *.gcda *.gcno |
| 379 | 379 |
all: all-am |
| ... | ... |
@@ -51,7 +51,7 @@ freshclam_SOURCES = \ |
| 51 | 51 |
|
| 52 | 52 |
AM_CFLAGS=@WERR_CFLAGS@ |
| 53 | 53 |
DEFS = @DEFS@ -DCL_NOTHREADS |
| 54 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ |
|
| 54 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ |
|
| 55 | 55 |
LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ |
| 56 | 56 |
|
| 57 | 57 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT) |
| ... | ... |
@@ -396,7 +396,7 @@ freshclam_SOURCES = \ |
| 396 | 396 |
mirman.h |
| 397 | 397 |
|
| 398 | 398 |
AM_CFLAGS = @WERR_CFLAGS@ |
| 399 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ |
|
| 399 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ |
|
| 400 | 400 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) |
| 401 | 401 |
CLEANFILES = *.gcda *.gcno |
| 402 | 402 |
all: all-am |
| ... | ... |
@@ -37,6 +37,6 @@ sigtool_SOURCES = \ |
| 37 | 37 |
|
| 38 | 38 |
AM_CFLAGS=@WERR_CFLAGS@ |
| 39 | 39 |
DEFS = @DEFS@ -DCL_NOTHREADS |
| 40 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ |
|
| 40 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ |
|
| 41 | 41 |
LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ |
| 42 | 42 |
CLEANFILES=*.gcda *.gcno |
| ... | ... |
@@ -380,7 +380,7 @@ sigtool_SOURCES = \ |
| 380 | 380 |
sigtool.c |
| 381 | 381 |
|
| 382 | 382 |
AM_CFLAGS = @WERR_CFLAGS@ |
| 383 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ |
|
| 383 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ |
|
| 384 | 384 |
CLEANFILES = *.gcda *.gcno |
| 385 | 385 |
all: all-am |
| 386 | 386 |
|