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/12/01 15:24:28 UTC

svn commit: r885766 - in /httpd/httpd/trunk/modules/proxy: NWGNUmakefile NWGNUproxy

Author: fuankg
Date: Tue Dec  1 14:24:27 2009
New Revision: 885766

URL: http://svn.apache.org/viewvc?rev=885766&view=rev
Log:
fixed NetWare proxy export list;
only build mod_serf if we have zlib.

Modified:
    httpd/httpd/trunk/modules/proxy/NWGNUmakefile
    httpd/httpd/trunk/modules/proxy/NWGNUproxy

Modified: httpd/httpd/trunk/modules/proxy/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUmakefile?rev=885766&r1=885765&r2=885766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUmakefile Tue Dec  1 14:24:27 2009
@@ -165,11 +165,13 @@
 # If WITH_MOD_SERF and SERFSRC have been defined then build the mod_serf module
 ifdef WITH_MOD_SERF
 ifneq "$(SERFSRC)" ""
+ifneq "$(ZLIBSDK)" ""
 TARGET_nlm += \
 	$(OBJDIR)/serf.nlm \
 	$(EOLIST)
 endif
 endif
+endif
 
 #
 # If there is an LIB target, put it here

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxy?rev=885766&r1=885765&r2=885766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Tue Dec  1 14:24:27 2009
@@ -256,6 +256,7 @@
 $(OBJDIR)/mod_proxy.imp:
 	@echo Creating $@
 	@echo # Exports of mod_proxy > $@
+	@echo   (AP$(VERSION_MAJMIN)) >> $@
 	@echo   proxy_module, >> $@
 	@echo   proxy_hook_canon_handler, >> $@
 	@echo   proxy_hook_post_request, >> $@