github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make sure solaris can find the stupid httpd included pcre lib if need be.

Browse Source
This commit is contained in:
brectanus 2008-01-29 22:16:49 +00:00
parent 588b4fba81
commit 698bff5fae
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2/Makefile.in
View File

@ -44,9 +44,9 @@ APU_LDFLAGS = @APU_LDFLAGS@
APU_LIBS = @APU_LIBS@ APU_LIBS = @APU_LIBS@
APU_LINK_LD = @APU_LINK_LD@ APU_LINK_LD = @APU_LINK_LD@
CPPFLAGS=@CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS) CPPFLAGS = @CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS)
LIBS=$(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS) LIBS = $(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS)
LDFLAGS= LDFLAGS = @LDFLAGS@
COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS) $(LIBS) COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS) $(LIBS)

3
apache2/configure.in
View File

@ -104,6 +104,7 @@ AC_ARG_WITH(httpd-src,
[ [
if test -n "$withval"; then if test -n "$withval"; then
CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre" CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
LDFLAGS="$LDFLAGS -L$withval/srclib/pcre"
pcre_path="$withval/srclib/pcre" pcre_path="$withval/srclib/pcre"
apr_path="$withval/srclib/apr" apr_path="$withval/srclib/apr"
apu_path="$withval/srclib/apr-util" apu_path="$withval/srclib/apr-util"
@ -217,6 +218,8 @@ done;
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$APXS_INCLUDES $CPPFLAGS" CPPFLAGS="$APXS_INCLUDES $CPPFLAGS"
save_LDFLAGS=$LDFLAGS
LDFLAGS="$APXS_LDFLAGS $LDFLAGS"
AC_SUBST(EXTRA_CFLAGS) AC_SUBST(EXTRA_CFLAGS)
AC_SUBST(MODSEC_EXTRA_CFLAGS) AC_SUBST(MODSEC_EXTRA_CFLAGS)