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 241c847a83a5f0913758844c935fa34623c45b2f..7b54f947230647954bce0ffb71264e4561102a4b 100644 (file)
--- 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 a7710c2e8da3126a4d5d6c3ca8ec22db693cc73e..07c38e3becd45c8c92c7f9586ef7f4326c3e1e8b 100644 (file)
--- 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