Some NetWare build tweaks.

Added check for APR_HAS_LDAP; renamed some build vars.


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

2 files changed, 48 insertions, 35 deletions

diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index fa4da789c2..b929d01a54 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -1,16 +1,30 @@
 #
-# Declare the sub-directories to be built here
-#
 # To build with exerimental modules set the environment
-#  variable EXPERIMENTAL=1
+#  variable WITH_EXPERIMENTAL=1
 # To build with the mod_ssl module set the environment
-#  variable WITH_MOD_SSL=1
+#  variable WITH_SSL=1
+# To build with the mod_lua module set the environment
+#  variable WITH_LUA=1
+
+#
+# Check if LDAP is enabled in APR-UTIL
+#
+include $(AP_WORK)/build/NWGNUenvironment.inc
+ifeq "$(wildcard $(APRUTIL)/include/apr_ldap.h)" "$(APRUTIL)/include/apr_ldap.h"
+WITH_LDAP = $(shell $(AWK) '/^\#define APR_HAS_LDAP /{print $$3}' $(APRUTIL)/include/apr_ldap.h)
+else
+WITH_LDAP = 0
+endif
 
 # If USE_STDSOCKETS is defined we allways build mod_ssl
 ifdef USE_STDSOCKETS
-WITH_MOD_SSL=1
+WITH_SSL = 1
 endif
 
+#
+# Declare the sub-directories to be built here
+#
+
 SUBDIRS = \
 	aaa \
 	cache \
@@ -31,58 +45,51 @@ SUBDIRS = \
 	slotmem \
 	$(EOLIST)
 
-# If LDAPSDK has been defined then build the util_ldap module
+# If WITH_LDAP and LDAPSDK have been defined then build the util_ldap module
+ifeq "$(WITH_LDAP)" "1"
 ifneq "$(LDAPSDK)" ""
-SUBDIRS += ldap \
-	$(EOLIST)
+SUBDIRS += ldap
+endif
 endif
 
-# If WITH_MOD_SSL and OSSLSDK have been defined then build the mod_ssl module
-ifdef WITH_MOD_SSL
+# If WITH_SSL and OSSLSDK have been defined then build the mod_ssl module
+ifeq "$(WITH_SSL)" "1"
 ifneq "$(OSSLSDK)" ""
-SUBDIRS += ssl \
-	$(EOLIST)
+SUBDIRS += ssl
 endif
 endif
 
-# If WITH_MOD_LUA and LUASRC have been defined then build the mod_lua module
-ifdef WITH_MOD_LUA
+# If WITH_LUA and LUASRC have been defined then build the mod_lua module
+ifeq "$(WITH_LUA)" "1"
 ifneq "$(LUASRC)" ""
-SUBDIRS += lua \
-	$(EOLIST)
+SUBDIRS += lua
 endif
 endif
 
-# Allow the experimental modules to be built if EXPERIMENTAL is defined
-ifdef EXPERIMENTAL
-SUBDIRS += experimental \
-	$(EOLIST)
+# Allow the experimental modules to be built if WITH_EXPERIMENTAL is defined
+ifeq "$(WITH_EXPERIMENTAL)" "1"
+SUBDIRS += experimental
 endif
 
-# Allow the debugging modules to be built if DEBUG is defined
-ifdef DEBUG
-SUBDIRS += debugging \
-	$(EOLIST)
+# Allow the debugging modules to be built if WITH_DEBUGGING is defined
+ifeq "$(WITH_DEBUGGING)" "1"
+SUBDIRS += debugging
 endif
 
-# Allow the test modules to be built if TEST is defined
-ifdef TEST
-SUBDIRS += test \
-	$(EOLIST)
+# Allow the test modules to be built if WITH_TEST is defined
+ifeq "$(WITH_TEST)" "1"
+SUBDIRS += test
 endif
 
 #If the mod_edir directory exists then build the mod_edir module
 ifeq "$(wildcard $(STDMOD)/mod_edir)" "$(STDMOD)/mod_edir"
-SUBDIRS += mod_edir \
-	$(EOLIST)
+SUBDIRS += mod_edir
 endif
 
-
 #
 # Get the 'head' of the build environment.  This includes default targets and
 # paths to tools
 #
-
 include $(AP_WORK)/build/NWGNUhead.inc
 
 #
diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile
index 7320af5b50..fdb23f6b52 100644
--- a/modules/aaa/NWGNUmakefile
+++ b/modules/aaa/NWGNUmakefile
@@ -18,6 +18,11 @@ include $(AP_WORK)/build/NWGNUhead.inc
 #
 # Make sure all needed macro's are defined
 #
+ifeq "$(wildcard $(APRUTIL)/include/apr_ldap.h)" "$(APRUTIL)/include/apr_ldap.h"
+WITH_LDAP = $(shell $(AWK) '/^\#define APR_HAS_LDAP /{print $$3}' $(APRUTIL)/include/apr_ldap.h)
+else
+WITH_LDAP = 0
+endif
 
 #
 # These directories will be at the beginning of the include list, followed by
@@ -168,10 +173,11 @@ TARGET_nlm = \
 	$(OBJDIR)/accesscompat.nlm \
 	$(EOLIST)
 
-# If LDAPSDK has been defined then build the authnz_ldap module
+# If WITH_LDAP and LDAPSDK have been defined then build the authnz_ldap module
+ifeq "$(WITH_LDAP)" "1"
 ifneq "$(LDAPSDK)" ""
-TARGET_nlm += $(OBJDIR)/authnzldap.nlm \
-	$(EOLIST)
+TARGET_nlm += $(OBJDIR)/authnzldap.nlm
+endif
 endif
 
 #