added NetWare build defaults; added path sanity checks; removed obsolete include...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793197 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 0ee27cdb0c20fa5618a6a5509bce916309be504c..cc7db4710d9f9adcc6ad04a37b8fd5795420c2b1 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -1,3 +1,34 @@
+#
+# Define our required macro's if not already done.
+#
+
+ifndef AP_WORK
+export AP_WORK = $(CURDIR)
+endif
+
+ifndef APR_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr"
+export APR_WORK = $(AP_WORK)/srclib/apr
+endif
+endif
+ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"
+$(error APR_WORK does not point to a valid APR source tree) 
+endif
+
+ifndef APU_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-uril"
+export APU_WORK = $(AP_WORK)/srclib/apr-util
+endif
+endif
+ifndef APU_WORK
+ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h"
+export APU_WORK = $(APR_WORK)
+endif
+endif
+ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"
+$(error APU_WORK does not point to a valid APU source tree) 
+endif
+
 #
 # Declare the sub-directories to be built here
 #
@@ -43,7 +74,6 @@ XINCDIRS      += \
                        $(AP_WORK)/server/mpm/NetWare \
                        $(PCRESDK) \
                        $(NWOS) \
-                       $(AP_WORK)/modules/ssl \
                        $(EOLIST)
 
 #