From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 1 May 2012 23:03:57 +0000 (+0000)
Subject: Fixed NetWare mod_serf build.
X-Git-Tag: 2.5.0-alpha~6919
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92fdce99c6084b4aad971fde02223ee79f77f7cb;p=thirdparty%2Fapache%2Fhttpd.git

Fixed NetWare mod_serf build.
Submitted by: normw gknw net


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

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index 2e7f8772129..d3ab0e6d87e 100644
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -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 += \
diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index c9ba6a4fc52..0ea3810640f 100644
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -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 \