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

Fix CPPFLAGS when building against httpd src libs.

Browse Source
This commit is contained in:
brectanus 2008-01-29 21:11:51 +00:00
parent 764fe94ab0
commit 229b1f9db6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache2/Makefile.in
View File

@ -44,7 +44,7 @@ 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=$(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=

2
apache2/configure.in
View File

@ -103,6 +103,7 @@ AC_ARG_WITH(httpd-src,
[PATH is to the Apache httpd source tree where srclib will be used as a base for pcre, apr and apu config scripts.])], [PATH is to the Apache httpd source tree where srclib will be used as a base for pcre, apr and apu config scripts.])],
[ [
if test -n "$withval"; then if test -n "$withval"; then
CPPFLAGS="$CPPFLAGS -I$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"
@ -216,7 +217,6 @@ done;
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$APXS_INCLUDES $CPPFLAGS" CPPFLAGS="$APXS_INCLUDES $CPPFLAGS"
CPPFLAGS=$save_CPPFLAGS
AC_SUBST(EXTRA_CFLAGS) AC_SUBST(EXTRA_CFLAGS)
AC_SUBST(MODSEC_EXTRA_CFLAGS) AC_SUBST(MODSEC_EXTRA_CFLAGS)