svn commit: r1332878 - in /httpd/httpd/trunk/modules/proxy: NWGNUmakefile NWGNUserf

[fu...@apache.org]

Author: fuankg
Date: Tue May  1 23:03:57 2012
New Revision: 1332878

URL: http://svn.apache.org/viewvc?rev=1332878&view=rev
Log:
Fixed NetWare mod_serf build.
Submitted by: normw gknw net

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

Modified: httpd/httpd/trunk/modules/proxy/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUmakefile?rev=1332878&r1=1332877&r2=1332878&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUmakefile Tue May  1 23:03:57 2012
@@ -167,8 +167,8 @@ TARGET_nlm = \
 	$(OBJDIR)/proxylbm_traf.nlm \
 	$(EOLIST)
 
-# If WITH_MOD_SERF and SERFSRC have been defined then build the mod_serf module
-ifdef WITH_MOD_SERF
+# If WITH_SERF and SERFSRC have been defined then build the mod_serf module
+ifdef WITH_SERF
 ifneq "$(SERFSRC)" ""
 ifneq "$(ZLIBSDK)" ""
 TARGET_nlm += \

Modified: httpd/httpd/trunk/modules/proxy/NWGNUserf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUserf?rev=1332878&r1=1332877&r2=1332878&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUserf (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUserf Tue May  1 23:03:57 2012
@@ -20,6 +20,13 @@ V_PATH = \
 			$(SERFSRC)/buckets \
 			$(ZLIBSDK) \
 			$(EOLIST)
+
+ifeq "$(wildcard $(SERFSRC)/incoming.c)" "$(SERFSRC)/incoming.c"
+V_PATH += \
+			$(SERFSRC)/auth \
+			$(EOLIST)
+endif
+
 #
 # These directories will be at the beginning of the include list, followed by
 # INCDIRS
@@ -197,7 +204,6 @@ FILES_nlm_objs += \
 	$(OBJDIR)/file_buckets.o \
 	$(OBJDIR)/headers_buckets.o \
 	$(OBJDIR)/limit_buckets.o \
-	$(OBJDIR)/mmap_buckets.o \
 	$(OBJDIR)/request_buckets.o \
 	$(OBJDIR)/response_buckets.o \
 	$(OBJDIR)/simple_buckets.o \
@@ -205,6 +211,23 @@ FILES_nlm_objs += \
 	$(OBJDIR)/ssl_buckets.o \
 	$(EOLIST)
 
+ifeq "$(wildcard $(SERFSRC)/incoming.c)" "$(SERFSRC)/incoming.c"
+ifeq "$(wildcard $(SERFSRC)/buckets/iovec_buckets.c)" "$(SERFSRC)/buckets/iovec_buckets.c"
+FILES_nlm_objs += \
+	$(OBJDIR)/auth.o \
+	$(OBJDIR)/auth_basic.o \
+	$(OBJDIR)/auth_digest.o \
+	$(OBJDIR)/bwtp_buckets.o \
+	$(OBJDIR)/incoming.o \
+	$(OBJDIR)/iovec_buckets.o \
+	$(OBJDIR)/outgoing.o \
+	$(OBJDIR)/ssltunnel.o \
+	$(EOLIST)
+else
+$(error This libserf version is broken for NetWare platform!)
+endif
+endif
+
 # Build zlib from source
 FILES_nlm_objs += \
 	$(OBJDIR)/adler32.o \