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 2e7f87721292259d67a5e9c485c16f34aafd5997..d3ab0e6d87ec0088de0cd232a49dca1d047ea8a3 100644 (file)
--- 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 c9ba6a4fc528b4f76eae6cc034c38675872b65d8..0ea3810640fa93cec49b6b91cc7c2786476b1151 100644 (file)
--- 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 \