From 7a300eb945f631216db45364346ab95e06284270 Mon Sep 17 00:00:00 2001
From: Ivan Prokhorov <IProkhorov@trustwave.com>
Date: Wed, 11 Nov 2015 10:29:57 +0200
Subject: [PATCH] Fix pcre cflags variable and adds LDFLAGS for dependencies

---
 examples/simple_example_using_c/Makefile.am |  2 +-
 src/Makefile.am                             |  4 ++--
 test/Makefile.am                            | 18 +++++++++---------
 test/benchmark/Makefile.am                  |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/examples/simple_example_using_c/Makefile.am b/examples/simple_example_using_c/Makefile.am
index 01af40c9..7d92396a 100644
--- a/examples/simple_example_using_c/Makefile.am
+++ b/examples/simple_example_using_c/Makefile.am
@@ -6,7 +6,7 @@ test_SOURCES = \
 	test.c
 
 test_LDADD = \
-	-L$(top_builddir)/src/.libs/ -lmodsecurity
+	-L$(top_builddir)/src/.libs/ -lmodsecurity $(YAJL_LDFLAGS) $(GEOIP_LDFLAGS)
 
 test_CFLAGS = \
 	-I$(top_builddir)/headers \
diff --git a/src/Makefile.am b/src/Makefile.am
index 16280265..81d82a29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -217,12 +217,12 @@ libmodsecurity_la_CPPFLAGS = \
 	-I ../headers \
 	$(GEOIP_CFLAGS) \
 	$(MODSEC_NO_LOGS) \
-	$(PCRE_CPPFLAGS)
+	$(PCRE_CFLAGS)
 
 libmodsecurity_la_LIBADD = \
 	-lrt \
         $(CURL_LDADD) \
-        $(GEOIP_LDADD) \
+        $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
         @LEXLIB@ \
         $(PCRE_LDADD) \
         $(YAJL_LDADD)
diff --git a/test/Makefile.am b/test/Makefile.am
index 290a7ca3..bf52afa7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -27,9 +27,9 @@ unit_tests_LDADD = \
 	-lrt \
 	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
-	$(GEOIP_LDADD) \
+	$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
 	$(PCRE_LDADD) \
-	$(YAJL_LDADD)
+	$(YAJL_LDFLAGS) $(YAJL_LDADD)
 
 unit_tests_CPPFLAGS = \
 	-std=c++11 \
@@ -41,7 +41,7 @@ unit_tests_CPPFLAGS = \
 	$(CURL_CFLAGS) \
 	$(MODSEC_NO_LOGS) \
 	$(GEOIP_CFLAGS) \
-	$(PCRE_CPPFLAGS) \
+	$(PCRE_CFLAGS) \
 	$(YAJL_CFLAGS)
 
 
@@ -56,9 +56,9 @@ regression_tests_LDADD = \
 	-lrt \
 	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
-	$(GEOIP_LDADD) \
+	$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
 	$(PCRE_LDADD) \
-	$(YAJL_LDADD)
+	$(YAJL_LDFLAGS) $(YAJL_LDADD)
 
 regression_tests_CPPFLAGS = \
 	-std=c++11 \
@@ -70,7 +70,7 @@ regression_tests_CPPFLAGS = \
 	$(CURL_CFLAGS) \
 	$(MODSEC_NO_LOGS) \
 	$(GEOIP_CFLAGS) \
-	$(PCRE_CPPFLAGS) \
+	$(PCRE_CFLAGS) \
 	$(YAJL_CFLAGS)
 
 
@@ -83,9 +83,9 @@ rules_optimization_LDADD = \
 	-lrt \
 	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
-	$(GEOIP_LDADD) \
+	$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
 	$(PCRE_LDADD) \
-	$(YAJL_LDADD)
+	$(YAJL_LDFLAGS) $(YAJL_LDADD)
 
 rules_optimization_CPPFLAGS = \
 	-std=c++11 \
@@ -97,5 +97,5 @@ rules_optimization_CPPFLAGS = \
 	$(CURL_CFLAGS) \
 	$(MODSEC_NO_LOGS) \
 	$(GEOIP_CFLAGS) \
-	$(PCRE_CPPFLAGS) \
+	$(PCRE_CFLAGS) \
 	$(YAJL_CFLAGS)
diff --git a/test/benchmark/Makefile.am b/test/benchmark/Makefile.am
index 5c99fb0a..df3f34a5 100644
--- a/test/benchmark/Makefile.am
+++ b/test/benchmark/Makefile.am
@@ -9,14 +9,14 @@ benchmark_LDADD = \
 	-lrt \
 	$(top_builddir)/src/.libs/libmodsecurity.a \
 	$(CURL_LDADD) \
-	$(GEOIP_LDADD) \
+	$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
 	$(PCRE_LDADD) \
-	$(YAJL_LDADD)
+	$(YAJL_LDFLAGS) $(YAJL_LDADD)
 
 benchmark_CPPFLAGS = \
 	-std=c++11 \
 	-I$(top_builddir)/headers \
-	$(PCRE_CPPFLAGS)
+	$(PCRE_CFLAGS)
 
 
 MAINTAINERCLEANFILES = \