From 06715a0deab2e282f1824c9ddba344ee9cf50cee Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Fri, 8 Feb 2008 22:03:48 +0000
Subject: [PATCH] Make sure to include the apxs cflags and apr cflags when
 building msc_test.

---
 apache2/Makefile.in       | 2 +-
 apache2/build/find_apr.m4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache2/Makefile.in b/apache2/Makefile.in
index a5925ab1..3bd5bc3f 100644
--- a/apache2/Makefile.in
+++ b/apache2/Makefile.in
@@ -111,7 +111,7 @@ mlogc-static:
 
 ### Experimental Test Framework (*NIX only right now)
 msc_test.lo: msc_test.c
-	$(LIBTOOL) --mode=compile $(CC) $(EXTRA_CFLAGS) $(MODSEC_EXTRA_CFLAGS) $(CPPFLAGS) -c msc_test.c
+	$(LIBTOOL) --mode=compile $(CC) $(APXS_CFLAGS) $(EXTRA_CFLAGS) $(MODSEC_EXTRA_CFLAGS) $(CPPFLAGS) -c msc_test.c
 
 msc_test: $(TESTOBJS) msc_test.lo
 	@objs=""; \
diff --git a/apache2/build/find_apr.m4 b/apache2/build/find_apr.m4
index 3d9361b9..c0000c13 100644
--- a/apache2/build/find_apr.m4
+++ b/apache2/build/find_apr.m4
@@ -48,7 +48,7 @@ done
 if test -n "${with_apr}"; then
     APR_CONFIG="${with_apr}/${APR_CONFIG}"
     AC_MSG_RESULT([${APR_CONFIG}])
-    APR_CFLAGS="`${APR_CONFIG} --includes --cppflags`"
+    APR_CFLAGS="`${APR_CONFIG} --includes --cppflags --cflags`"
     APR_LDFLAGS="`${APR_CONFIG} --ldflags`"
     APR_LIBS="`${APR_CONFIG} --libs`"
     APR_LINK_LD="`${APR_CONFIG} --link-ld`"