summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2008-12-01 17:42:56 +0100
committerBradley Nicholes <bnicholes@apache.org>2008-12-01 17:42:56 +0100
commit9de1ea6c158a5cc16958e1a39c0adbd669773d9a (patch)
tree8a42b69c1e9d4f8dc2950a036a955b7991ec2cfb /build
parentTo be safe, consume the entire brigade after processing an error bucket in (diff)
downloadapache2-9de1ea6c158a5cc16958e1a39c0adbd669773d9a.tar.xz
apache2-9de1ea6c158a5cc16958e1a39c0adbd669773d9a.zip
Allow for external PCRE on netware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722122 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
-rw-r--r--build/NWGNUenvironment.inc10
1 files changed, 9 insertions, 1 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 132a3dc50c..e39ba37e58 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -49,6 +49,11 @@ endif
# ZLIBSDK = C:/novell/ndk/zlibsdk
# endif
+# This is a placeholder
+# ifndef PCRESDK
+# PCRESDK = C:/novell/ndk/pcresdk
+# endif
+
ifndef METROWERKS
METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
endif
@@ -137,6 +142,9 @@ endif
ifneq "$(ZLIBSDK)" ""
INCDIRS := $(INCDIRS);$(ZLIBSDK)
endif
+ifneq "$(PCRESDK)" ""
+INCDIRS := $(INCDIRS);$(PCRESDK)
+endif
DEFINES = -DNETWARE
ifndef USE_STDSOCKETS
@@ -309,7 +317,7 @@ APR = $(APR_WORK)
APRUTIL = $(APU_WORK)
APULDAP = $(APU_WORK)/ldap
SUPMOD = $(AP_WORK)/support
-PCRE = $(AP_WORK)/srclib/pcre
+PCRE = $(PCRESDK)
APRTEST = $(APR_WORK)/test
HTTPD = $(AP_WORK)/modules/http
XML = $(APU_WORK)/xml