From 698bff5faedb9289c60887db6dc0e8ed5a03b8a1 Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Tue, 29 Jan 2008 22:16:49 +0000
Subject: [PATCH] Make sure solaris can find the stupid httpd included pcre lib
 if need be.

---
 apache2/Makefile.in  | 6 +++---
 apache2/configure.in | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apache2/Makefile.in b/apache2/Makefile.in
index 53db5c4a..3bdb73dc 100644
--- a/apache2/Makefile.in
+++ b/apache2/Makefile.in
@@ -44,9 +44,9 @@ APU_LDFLAGS = @APU_LDFLAGS@
 APU_LIBS = @APU_LIBS@
 APU_LINK_LD = @APU_LINK_LD@
 
-CPPFLAGS=@CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS)
-LIBS=$(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS)
-LDFLAGS=
+CPPFLAGS = @CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS)
+LIBS = $(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS)
+LDFLAGS = @LDFLAGS@
 
 COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS) $(LIBS)
 
diff --git a/apache2/configure.in b/apache2/configure.in
index b86373f1..483be194 100644
--- a/apache2/configure.in
+++ b/apache2/configure.in
@@ -104,6 +104,7 @@ AC_ARG_WITH(httpd-src,
 [
   if test -n "$withval"; then
     CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
+    LDFLAGS="$LDFLAGS -L$withval/srclib/pcre"
     pcre_path="$withval/srclib/pcre"
     apr_path="$withval/srclib/apr"
     apu_path="$withval/srclib/apr-util"
@@ -217,6 +218,8 @@ done;
 
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$APXS_INCLUDES $CPPFLAGS"
+save_LDFLAGS=$LDFLAGS
+LDFLAGS="$APXS_LDFLAGS $LDFLAGS"
 
 AC_SUBST(EXTRA_CFLAGS)
 AC_SUBST(MODSEC_EXTRA_CFLAGS)