From 854ca4c1cde6e2e044caabe98e9ceee19f16760e Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Tue, 1 Dec 2015 10:57:47 -0300
Subject: [PATCH] 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.
---
 Makefile.am        |  1 +
 configure.ac       |  3 ++-
 others/Makefile.am |  6 ++++++
 src/Makefile.am    | 10 ++--------
 4 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 others/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c85e6759..7b5f30a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ export MAYBE_TEST = test
 endif
 
 SUBDIRS = \
+	others \
 	src \
 	doc \
 	examples \
diff --git a/configure.ac b/configure.ac
index eeb10658..16aa6b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 \
diff --git a/others/Makefile.am b/others/Makefile.am
new file mode 100644
index 00000000..e9211f1c
--- /dev/null
+++ b/others/Makefile.am
@@ -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
diff --git a/src/Makefile.am b/src/Makefile.am
index 81d82a29..e94f5073 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 = \