Allow mod_deflate on NetWare to be compiled against zlib 1.2.1

Submitted by: Guenter Knauf <fuankg@apache.org>

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

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 2ec80c7a45cf8f513e00e083f017f8d1937a9fef..058169d17712d3112a456e478da26179b7d2fb0c 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -39,7 +39,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -181,15 +180,20 @@ FILES_nlm_objs = \
        $(OBJDIR)/crc32.o \
        $(OBJDIR)/deflate.o \
        $(OBJDIR)/inflate.o \
-       $(OBJDIR)/infblock.o \
-       $(OBJDIR)/infcodes.o \
        $(OBJDIR)/inffast.o \
        $(OBJDIR)/inftrees.o \
-       $(OBJDIR)/infutil.o \
        $(OBJDIR)/trees.o \
        $(OBJDIR)/zutil.o \
        $(EOLIST)
 
+ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"
+FILES_nlm_objs += \
+       $(OBJDIR)/infblock.o \
+       $(OBJDIR)/infcodes.o \
+       $(OBJDIR)/infutil.o \
+       $(EOLIST)
+endif
+
 #
 # These are the LIB files needed to create the NLM target above.
 # These will be added as a library command in the link.opt file.
@@ -264,11 +268,7 @@ install :: nlms FORCE
 # Any specialized rules here
 #
 
-ifneq "$(ZLIBSDK)" ""
-$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-       @echo Compiling $<
-       $(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-endif
+vpath %.c $(ZLIBSDK)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined