Günter Knauf's netware build fixes

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 8275e143b51298b3954f5b40224b2768dc331e5a..4b88d00db3d3a00cb46b2d597d2870755471d436 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/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  = libcurl
@@ -22,7 +22,6 @@ DESCR = cURL libcurl $(LIBCURL_VERSION_STR) - http://curl.haxx.se
 MTSAFE = YES
 STACK  = 64000
 SCREEN = none
-#MODULES       = libz.nlm
 EXPORTS        = @libcurl.imp
 
 # Edit the var below to point to your lib architecture.
@@ -99,10 +98,15 @@ NDK_ROOT = $(BASE)/ndk
 SDK_CLIB = $(NDK_ROOT)/nwsdk
 SDK_LIBC = $(NDK_ROOT)/libc
 SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
-CURL_INC = ../include
 
-INCLUDES = -I$(CURL_INC)
-INCLUDES += -I$(ZLIB_PATH)
+INCLUDES = -I. -I../include
+
+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
@@ -122,7 +126,7 @@ endif
 
 ifeq ($(OSTYPE),linux)
 DL     = '
--include $(BASE)/nlmconv/ncpfs.inc
+#-include $(BASE)/nlmconv/ncpfs.inc
 endif
 
 OBJS   = \
@@ -169,6 +173,14 @@ OBJS       = \
        $(OBJDIR)/http_ntlm.o \
        $(OBJDIR)/md5.o \
        $(OBJDIR)/strtoofft.o \
+       $(OBJDIR)/strerror.o \
+       $(OBJDIR)/hostares.o \
+       $(OBJDIR)/hostasyn.o \
+       $(OBJDIR)/hostip4.o \
+       $(OBJDIR)/hostip6.o \
+       $(OBJDIR)/hostsyn.o \
+       $(OBJDIR)/hostthre.o \
+       $(OBJDIR)/inet_ntop.o \
        $(OBJDIR)/nwlib.o
 
 
@@ -178,9 +190,9 @@ $(OBJDIR)/%.o: %.c
        @echo Compiling $<
        @$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/version.inc: $(CURL_INC)/curl/curl.h $(OBJDIR)
+$(OBJDIR)/version.inc: ../include/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
@@ -239,9 +251,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)
@@ -255,9 +267,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/lib/config-netware.h b/lib/config-netware.h
index 4a1d373bb980d52af9e78db2da7b9b1448366776..afa33417ed634c4df338d34312f2bd915053f2b8 100644 (file)
--- a/lib/config-netware.h
+++ b/lib/config-netware.h
@@ -182,10 +182,6 @@
 /* Define to 1 if you have the `ssl' library (-lssl). */\r
 #undef HAVE_LIBSSL\r
 \r
-/* If zlib is available */\r
-#undef HAVE_LIBZ\r
-//#define HAVE_LIBZ 1\r
-\r
 /* Define to 1 if you have the <limits.h> header file. */\r
 #define HAVE_LIMITS_H 1\r
 \r

diff --git a/lib/libcurl.imp b/lib/libcurl.imp
index 50ce90a0b2978d1a4caee97d8da6c92a06a3711d..15fd50dc6d7a24ad923840386f96aac1450ba4a2 100644 (file)
--- a/lib/libcurl.imp
+++ b/lib/libcurl.imp
@@ -9,7 +9,6 @@
        curl_easy_setopt,\r
        curl_escape,\r
        curl_unescape,\r
-       curl_formparse,\r
        curl_formfree,\r
        curl_getdate,\r
        curl_getenv,\r
@@ -39,6 +38,8 @@
        curl_version_info,\r
        curl_share_init,\r
        curl_share_setopt,\r
-       curl_share_cleanup\r
-\r
-\r
+       curl_share_cleanup,\r
+       curl_global_init_mem,\r
+       curl_easy_strerror,\r
+       curl_multi_strerror,\r
+       curl_share_strerror\r

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 1a07202160e3b83347a543f417d2ca8c9ec19ed3..6336b301988791e0fc5b210787f0cfe18f738c3b 100644 (file)
--- 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 20baa2ac0c7127c88c6c8e4790dd9a89940b1878..4ba4e6ef462e8ec97b9b0fc7228df640b04011b3 100644 (file)
--- a/src/config-netware.h
+++ b/src/config-netware.h
@@ -185,10 +185,6 @@
 /* Define to 1 if you have the `ssl' library (-lssl). */\r
 #undef HAVE_LIBSSL\r
 \r
-/* If zlib is available */\r
-#undef HAVE_LIBZ\r
-//#define HAVE_LIBZ 1\r
-\r
 /* Define to 1 if you have the <limits.h> header file. */\r
 #define HAVE_LIMITS_H 1\r
 \r