mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-29 19:24:29 +03:00
Makes the build system to look for yajl using a macro file
Now searching for yajl using find_yajl.m4 macro file instead of using pkg-config directly. If YAJL was not found or if it was disabled in the configure phase, the code will be compiled without JSON support.
This commit is contained in:
committed by
Felipe Zimmerle
parent
e90874a694
commit
8d4c3e4f5c
@@ -6,6 +6,7 @@ msc_test_SOURCES = msc_test.c \
|
||||
$(top_srcdir)/apache2/msc_crypt.c \
|
||||
$(top_srcdir)/apache2/msc_geo.c \
|
||||
$(top_srcdir)/apache2/msc_gsb.c \
|
||||
$(top_srcdir)/apache2/msc_json.c \
|
||||
$(top_srcdir)/apache2/msc_logging.c \
|
||||
$(top_srcdir)/apache2/msc_lua.c \
|
||||
$(top_srcdir)/apache2/msc_multipart.c \
|
||||
@@ -32,7 +33,8 @@ msc_test_CFLAGS = @APR_CFLAGS@ \
|
||||
@LIBXML2_CFLAGS@ \
|
||||
@LUA_CFLAGS@ \
|
||||
@MODSEC_EXTRA_CFLAGS@ \
|
||||
@PCRE_CFLAGS@
|
||||
@PCRE_CFLAGS@ \
|
||||
@YAJL_CFLAGS@
|
||||
|
||||
msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
|
||||
@APR_CPPFLAGS@ \
|
||||
@@ -43,14 +45,16 @@ msc_test_LDADD = @APR_LDADD@ \
|
||||
@APU_LDADD@ \
|
||||
@LIBXML2_LDADD@ \
|
||||
@LUA_LDADD@ \
|
||||
@PCRE_LDADD@
|
||||
@PCRE_LDADD@ \
|
||||
@YAJL_LDADD@
|
||||
|
||||
msc_test_LDFLAGS = @APR_LDFLAGS@ \
|
||||
@APU_LDFLAGS@ \
|
||||
@APXS_LDFLAGS@ \
|
||||
@LIBXML2_LDFLAGS@ \
|
||||
@LUA_LDFLAGS@ \
|
||||
@PCRE_LDFLAGS@
|
||||
@PCRE_LDFLAGS@ \
|
||||
@YAJL_LDFLAGS@
|
||||
|
||||
check_SCRIPTS = run-unit-tests.pl
|
||||
TESTS = $(check_SCRIPTS)
|
||||
|
Reference in New Issue
Block a user