changed to use libssh2 0.16;

fixed link order in case libssh2 is build with zlib.

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index e5ee92246990eba2e3e5216a30bfc84c00c0f21b..db8cb78e49e356300bc6f9373ce4cf3a678a7335 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -25,7 +25,7 @@ endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.15
+LIBSSH2_PATH = ../../libssh2-0.16
 endif
 
 ifndef INSTDIR
@@ -145,15 +145,6 @@ ifdef WITH_ARES
        INCLUDES += -I$(ARES_LIB)
        LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)
 endif
-ifdef WITH_ZLIB
-       INCLUDES += -I$(ZLIB_PATH)
-ifdef LINK_STATIC
-       LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
-else
-       MODULES += libz.nlm
-       IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
-endif
-endif
 ifdef WITH_SSH2
        INCLUDES += -I$(LIBSSH2_PATH)/include
 ifdef LINK_STATIC
@@ -169,6 +160,15 @@ ifdef WITH_SSL
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
        IMPORTS += GetProcessSwitchCount RunningProcess
 endif
+ifdef WITH_ZLIB
+       INCLUDES += -I$(ZLIB_PATH)
+ifdef LINK_STATIC
+       LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
+else
+       MODULES += libz.nlm
+       IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
+endif
+endif
 
 ifeq ($(LIBARCH),LIBC)
        INCLUDES += -I$(SDK_LIBC)/include

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 762174ee3706ca0dd7a9b672d3c50f3a94ea2c69..4a12dc6f4454428146fffe4ed356e9f349abaf00 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -25,7 +25,7 @@ endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.15
+LIBSSH2_PATH = ../../libssh2-0.16
 endif
 
 ifndef INSTDIR
@@ -144,15 +144,6 @@ else
        MODULES = libcurl.nlm
        IMPORTS = @$(CURL_LIB)/libcurl.imp
 endif
-ifdef WITH_ZLIB
-       INCLUDES += -I$(ZLIB_PATH)
-ifdef LINK_STATIC
-       LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
-else
-       MODULES += libz.nlm
-       IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
-endif
-endif
 ifdef WITH_SSH2
        INCLUDES += -I$(LIBSSH2_PATH)/include
 ifdef LINK_STATIC
@@ -167,6 +158,15 @@ ifdef WITH_SSL
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
        IMPORTS += GetProcessSwitchCount RunningProcess
 endif
+ifdef WITH_ZLIB
+       INCLUDES += -I$(ZLIB_PATH)
+ifdef LINK_STATIC
+       LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
+else
+       MODULES += libz.nlm
+       IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
+endif
+endif
 
 ifeq ($(LIBARCH),LIBC)
        INCLUDES += -I$(SDK_LIBC)/include