From: Bradley Nicholes <bnicholes@apache.org>
Date: Sat, 14 Aug 2004 17:36:06 +0000 (+0000)
Subject: Conditionally build the proxy_ajp module of the ajplib file are available
X-Git-Tag: STRIKER_2_1_0_RC1~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=209ddfbb120a8c497c86eee6df985c3b0346a4ac;p=apache

Conditionally build the proxy_ajp module of the ajplib file are available


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

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index 241c847a83..7b54f94723 100644
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -157,9 +157,15 @@ TARGET_nlm = \
 	$(OBJDIR)/proxyftp.nlm \
 	$(OBJDIR)/proxyhtp.nlm \
 	$(OBJDIR)/proxybalancer.nlm \
-#	$(OBJDIR)/proxyajp.nlm \
 	$(EOLIST)
 
+# If AJPLIB has been defined then build the proxyajp module
+ifneq "$(AJPLIB)" ""
+TARGET_nlm += $(OBJDIR)/proxyajp.nlm \
+	$(EOLIST)
+endif
+
+
 #
 # If there is an LIB target, put it here
 #
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index a7710c2e8d..07c38e3bec 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -20,6 +20,7 @@ XINCDIRS	+= \
 			$(NWOS) \
 			$(AP_WORK)/modules/http \
 			$(AP_WORK)/modules/arch/netware \
+			$(AJPLIB) \
 			$(AP_WORK)/srclib/apr/include \
 			$(AP_WORK)/srclib/apr-util/include \
 			$(AP_WORK)/srclib/apr \
@@ -168,6 +169,9 @@ TARGET_lib = \
 FILES_nlm_objs = \
 	$(OBJDIR)/proxy_ajp.o \
 	$(OBJDIR)/proxy_util.o \
+	$(OBJDIR)/ajp_header.o \
+	$(OBJDIR)/ajp_msg.o \
+	$(OBJDIR)/ajp_link.o \
 	$(OBJDIR)/libprews.o \
 	$(EOLIST)
 
@@ -252,7 +256,7 @@ install :: nlms FORCE
 # Any specialized rules here
 #
 
-vpath %.c ../arch/netware
+vpath %.c ../arch/netware $(AJPLIB)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined