diff options
| author | Guenter Knauf <fuankg@apache.org> | 2009-07-11 22:01:31 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2009-07-11 22:01:31 +0000 |
| commit | 897ffb8d831005c14177b3dc2bf0fb8b22f6110b (patch) | |
| tree | b20e2bca1c66347e0125e794c74ca3e944fb1367 /build/NWGNUenvironment.inc | |
| parent | 8037277da59906b1dd928fa00d38e7b1ae4bb7dc (diff) | |
| download | httpd-897ffb8d831005c14177b3dc2bf0fb8b22f6110b.tar.gz | |
added NetWare build SDK path sanity checks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793231 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/NWGNUenvironment.inc')
| -rw-r--r-- | build/NWGNUenvironment.inc | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index c9135518ec..ad69d3ff12 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -38,22 +38,31 @@ endif ifndef NOVELLLIBC NOVELLLIBC = C:/novell/ndk/libc endif +ifneq "$(wildcard $(NOVELLLIBC)/include/ndkvers.h)" "$(NOVELLLIBC)/include/ndkvers.h" +$(error NOVELLLIBC does not point to a valid Novell LIBC SDK) +endif -# This is a placeholder -# ifndef LDAPSDK -# LDAPSDK = C:/novell/ndk/cldapsdk -# endif +ifndef LDAPSDK +LDAPSDK = C:/novell/ndk/cldapsdk/NetWare/libc +endif +ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h" +$(error LDAPSDK does not point to a valid Novell CLDAP SDK) +endif + +ifndef PCRESRC +ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre.in)" "$(AP_WORK)/srclib/pcre/pcre.in" +PCRESRC = $(AP_WORK)/srclib/pcre +endif +endif +ifneq "$(wildcard $(PCRESRC)/pcre.in)" "$(PCRESRC)/pcre.in" +$(error PCRESRC does not point to a valid PCRE source tree) +endif # This is a placeholder # ifndef ZLIBSDK # 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 @@ -142,8 +151,8 @@ endif ifneq "$(ZLIBSDK)" "" INCDIRS := $(INCDIRS);$(ZLIBSDK) endif -ifneq "$(PCRESDK)" "" -INCDIRS := $(INCDIRS);$(PCRESDK) +ifneq "$(PCRESRC)" "" +INCDIRS := $(INCDIRS);$(PCRESRC) endif DEFINES = -DNETWARE @@ -317,7 +326,7 @@ APR = $(APR_WORK) APRUTIL = $(APU_WORK) APULDAP = $(APU_WORK)/ldap SUPMOD = $(AP_WORK)/support -PCRE = $(PCRESDK) +PCRE = $(PCRESRC) APRTEST = $(APR_WORK)/test HTTPD = $(AP_WORK)/modules/http XML = $(APU_WORK)/xml |