You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2009/07/12 00:01:31 UTC
svn commit: r793231 - /httpd/httpd/trunk/build/NWGNUenvironment.inc
Author: fuankg
Date: Sat Jul 11 22:01:31 2009
New Revision: 793231
URL: http://svn.apache.org/viewvc?rev=793231&view=rev
Log:
added NetWare build SDK path sanity checks.
Modified:
httpd/httpd/trunk/build/NWGNUenvironment.inc
Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=793231&r1=793230&r2=793231&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Sat Jul 11 22:01:31 2009
@@ -38,22 +38,31 @@
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 @@
ifneq "$(ZLIBSDK)" ""
INCDIRS := $(INCDIRS);$(ZLIBSDK)
endif
-ifneq "$(PCRESDK)" ""
-INCDIRS := $(INCDIRS);$(PCRESDK)
+ifneq "$(PCRESRC)" ""
+INCDIRS := $(INCDIRS);$(PCRESRC)
endif
DEFINES = -DNETWARE
@@ -317,7 +326,7 @@
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