Make 2.2.x build working with external (and newer) PCRE.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1087707 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 097c66f954ab52c6099e92e2b7fc146118448774..aa7756a26943832c2a0ececf3115fe5e7855b06d 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -357,6 +357,8 @@ FILES_lib_objs = \
        $(OBJDIR)/chartables.o \
        $(EOLIST)
 
+XDEFINES += -DHAVE_CONFIG_H
+
 endif
 
 #
@@ -440,7 +442,7 @@ prebuild :: FORCE
 
 vpath %.c server:modules/arch/netware:modules/http:modules/aaa:modules/mappers
 vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers
-vpath %.c os/netware:server/mpm/netware:srclib/pcre
+vpath %.c os/netware:server/mpm/netware:$(PCRE)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index add5fda5b1045f2fac719022efe298d92587501a..d49b6ead7f2600f784362609d7ae681e963239ea 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -49,9 +49,9 @@ ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h"
 $(error LDAPSDK does not point to a valid Novell CLDAP SDK) 
 endif
 
-#ifndef PCRESRC
+ifndef PCRESRC
 PCRESRC = $(AP_WORK)/srclib/pcre
-#endif
+endif
 ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in"
 $(error PCRESRC does not point to a valid PCRE source tree) 
 endif