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)