Cleaning up the NetWare make files so that they detect and find the zlib

source correctly

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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 16bb067658989ce2edbb5e421836d1a0b23574ce..8cbea7b3505939b20ad9f1d5bbed6dd7639aab17 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -44,6 +44,11 @@ endif
 # LDAPSDK = C:/novell/ndk/cldapsdk
 # endif
 
+# This is a placeholder
+# ifndef ZLIBSDK
+# ZLIBSDK = C:/novell/ndk/zlibsdk
+# endif
+
 ifndef METROWERKS
 METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
 endif
@@ -117,6 +122,9 @@ INCDIRS     = $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include
 ifneq "$(LDAPSDK)" ""
 INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
 endif
+ifneq "$(ZLIBSDK)" ""
+INCDIRS := $(INCDIRS);$(ZLIBSDK)
+endif
 
 DEFINES                = -DNETWARE
 

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 94b80107d1d9e068ff02d725df467ca016260ea1..b39035d660c5fa850364ec97b1bf1d4a65ad6913 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -33,7 +33,6 @@ XINCDIRS      += \
                        $(AP_WORK)/srclib/apr/include \
                        $(AP_WORK)/srclib/apr-util/include \
                        $(AP_WORK)/srclib/apr \
-                       $(AP_WORK)/srclib/zlib \
                        $(EOLIST)
 
 #
@@ -265,10 +264,11 @@ install :: nlms FORCE
 # Any specialized rules here
 #
 
-$(OBJDIR)/%.o: ../../srclib/zlib/%.c $(OBJDIR)\cc.opt
+ifneq "$(ZLIBSDK)" ""
+$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\cc.opt
        @echo Compiling $<
-       $(CC) ..\..\srclib\zlib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
+       $(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+endif
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile
index d9ddfff036a62d70accd7b15bc7cfbf161ec42bd..c8509428eb642d93fc87b98a996a5def34ae111e 100644 (file)
--- a/modules/filters/NWGNUmakefile
+++ b/modules/filters/NWGNUmakefile
@@ -156,9 +156,11 @@ TARGET_nlm = \
        $(EOLIST)
        
 # If the zlib libraries source exists then build the mod_deflate module
-ifeq "$(wildcard $(AP_WORK)\srclib\zlib)" "$(AP_WORK)\srclib\zlib"
+ifneq "$(ZLIBSDK)" ""
+ifeq "$(wildcard $(ZLIBSDK))" "$(ZLIBSDK)"
 TARGET_nlm += $(OBJDIR)/deflate.nlm \
               $(EOLIST)
+endif
 else
 TARGET_nlm += $(OBJDIR)/extfiltr.nlm \
               $(EOLIST)