mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
Removes libinjection sources from the main project and add it as subfolder
That way we can control the CFLAGS that will be sent to libinjection. Avoiding, for instance, the utilization of c++11 on libinjection c code.
This commit is contained in:
parent
ea636e80ee
commit
854ca4c1cd
@ -4,6 +4,7 @@ export MAYBE_TEST = test
|
||||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
others \
|
||||
src \
|
||||
doc \
|
||||
examples \
|
||||
|
@ -58,7 +58,7 @@ fi
|
||||
|
||||
|
||||
# Check if the compiler is c++11 compatible.
|
||||
AX_CXX_COMPILE_STDCXX_11(,mandatory)
|
||||
# AX_CXX_COMPILE_STDCXX_11(,mandatory)
|
||||
|
||||
# Check for libinjection
|
||||
AC_CHECK_FILE("others/libinjection/src/libinjection_html5.c", HAS_LIBINJECTION=1)
|
||||
@ -220,6 +220,7 @@ AC_CONFIG_FILES([\
|
||||
Makefile \
|
||||
doc/Makefile \
|
||||
src/Makefile \
|
||||
others/Makefile \
|
||||
test/Makefile \
|
||||
test/benchmark/Makefile \
|
||||
examples/Makefile \
|
||||
|
6
others/Makefile.am
Normal file
6
others/Makefile.am
Normal file
@ -0,0 +1,6 @@
|
||||
|
||||
noinst_LTLIBRARIES = libinjection.la
|
||||
libinjection_la_SOURCES = \
|
||||
libinjection/src/libinjection_html5.c \
|
||||
libinjection/src/libinjection_sqli.c \
|
||||
libinjection/src/libinjection_xss.c
|
@ -193,18 +193,11 @@ libmodsecurity_la_SOURCES = \
|
||||
rule.cc \
|
||||
unique_id.cc \
|
||||
${ACTIONS} \
|
||||
${LIBINJECTION} \
|
||||
${OPERATORS} \
|
||||
${UTILS} \
|
||||
${VARIABLES}
|
||||
|
||||
|
||||
LIBINJECTION = \
|
||||
../others/libinjection/src/libinjection_html5.c \
|
||||
../others/libinjection/src/libinjection_sqli.c \
|
||||
../others/libinjection/src/libinjection_xss.c
|
||||
|
||||
|
||||
libmodsecurity_la_CFLAGS =
|
||||
|
||||
|
||||
@ -225,7 +218,8 @@ libmodsecurity_la_LIBADD = \
|
||||
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
|
||||
@LEXLIB@ \
|
||||
$(PCRE_LDADD) \
|
||||
$(YAJL_LDADD)
|
||||
$(YAJL_LDADD) \
|
||||
../others/libinjection.la
|
||||
|
||||
|
||||
libmodsecurity_la_LDFLAGS = \
|
||||
|
Loading…
x
Reference in New Issue
Block a user