From 87fc4ad9190eeee8215145b425e83a2da9617f7f Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Sat, 4 Aug 2007 23:35:23 +0000
Subject: changed to use libssh2 0.16; fixed link order in case libssh2 is
 build with zlib.

---
 src/Makefile.netware | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Makefile.netware')

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 762174ee3..4a12dc6f4 100644
--- 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
-- 
cgit v1.2.3