From 0b04c521198dcb5de1b5c1e7e27f0d27098a1481 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 4 Jun 2004 07:02:30 +0000
Subject: =?UTF-8?q?G=FCnter=20Knauf's=20netware=20build=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Makefile.netware | 28 +++++++++++++++++-----------
 src/config-netware.h |  4 ----
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 1a0720216..6336b3019 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -12,7 +12,7 @@ BASE	= c:/novell
 INSTDIR	= s:/libcurl
 
 # Edit the path below to point to the base of your Zlib sources.
-ZLIB_PATH = ../../../cw/zlib-src-1.1.4
+#ZLIB_PATH = ../../../cw/zlib-src-1.1.4
 
 # Edit the vars below to change NLM target settings.
 TARGET  = curl
@@ -104,7 +104,13 @@ CURL_INC = ../include
 CURL_LIB = ../lib
 
 INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
-INCLUDES += -I$(ZLIB_PATH)
+
+ifdef ZLIB_PATH
+	INCLUDES += -I$(ZLIB_PATH)
+	CFLAGS += -DHAVE_ZLIB_H -DHAVE_LIBZ
+	IMPORTS+ = @$(ZLIB_PATH)/nw/zlib.imp
+	MODULES+ = libz.nlm
+endif
 
 ifeq ($(LIBARCH),LIBC)
 	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
@@ -123,7 +129,7 @@ endif
 
 ifeq ($(OSTYPE),linux)
 DL	= '
--include $(BASE)/nlmconv/ncpfs.inc
+#-include $(BASE)/nlmconv/ncpfs.inc
 endif
 
 OBJS	= \
@@ -141,9 +147,9 @@ $(OBJDIR)/%.o: %.c
 	@echo Compiling $<
 	@$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/version.inc: $(CURL_INC)/curl/curl.h $(OBJDIR)
+$(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR)
 	@echo Creating $@
-	@awk -f ../packages/netware/get_ver.awk $< > $@
+	@awk -f ../packages/NetWare/get_ver.awk $< > $@
 
 dist: all
 	-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
@@ -202,9 +208,9 @@ ifeq ($(LIBARCH),CLIB)
 	@echo $(DL)import @$(SDK_CLIB)/imports/threads.imp$(DL) >> $@
 	@echo $(DL)import @$(SDK_CLIB)/imports/nlmlib.imp$(DL) >> $@
 	@echo $(DL)import @$(SDK_CLIB)/imports/socklib.imp$(DL) >> $@
-	@echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapsdk.imp$(DL) >> $@
-	@echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapssl.imp$(DL) >> $@
-	@echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapx.imp$(DL) >> $@
+#	@echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapsdk.imp$(DL) >> $@
+#	@echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapssl.imp$(DL) >> $@
+#	@echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapx.imp$(DL) >> $@
 	@echo $(DL)module clib$(DL) >> $@
 else
 ifeq ($(LD),nlmconv)
@@ -218,9 +224,9 @@ endif
 	@echo $(DL)check _LibCCheckUnload$(DL) >> $@
 	@echo $(DL)import @$(SDK_LIBC)/imports/libc.imp$(DL) >> $@
 	@echo $(DL)import @$(SDK_LIBC)/imports/netware.imp$(DL) >> $@
-	@echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapsdk.imp$(DL) >> $@
-	@echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapssl.imp$(DL) >> $@
-	@echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapx.imp$(DL) >> $@
+#	@echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapsdk.imp$(DL) >> $@
+#	@echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapssl.imp$(DL) >> $@
+#	@echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapx.imp$(DL) >> $@
 	@echo $(DL)module libc$(DL) >> $@
 endif
 ifdef MODULES
diff --git a/src/config-netware.h b/src/config-netware.h
index 20baa2ac0..4ba4e6ef4 100644
--- a/src/config-netware.h
+++ b/src/config-netware.h
@@ -185,10 +185,6 @@
 /* Define to 1 if you have the `ssl' library (-lssl). */
 #undef HAVE_LIBSSL
 
-/* If zlib is available */
-#undef HAVE_LIBZ
-//#define HAVE_LIBZ 1
-
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
-- 
cgit v1.2.3