diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-01-23 00:26:45 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-01-23 00:26:45 +0000 |
| commit | 9ab7cda0105cd926ab67c31508c5d835466ce8e7 (patch) | |
| tree | 369d5f1cfe21ce2cfdcaeec337a9d4cbd812af5c | |
| parent | 6da70628c60d4f0914529076db5a72d3ca3fbe61 (diff) | |
| download | curl-9ab7cda0105cd926ab67c31508c5d835466ce8e7.tar.gz | |
enabled build with libssh2; fixed copyright for new year..
| -rw-r--r-- | ares/Makefile.netware | 2 | ||||
| -rw-r--r-- | lib/Makefile.netware | 23 | ||||
| -rw-r--r-- | src/Makefile.netware | 14 |
3 files changed, 34 insertions, 5 deletions
diff --git a/ares/Makefile.netware b/ares/Makefile.netware index d0a441daa..874f5bf94 100644 --- a/ares/Makefile.netware +++ b/ares/Makefile.netware @@ -20,7 +20,7 @@ endif TARGETS = adig.nlm ahost.nlm LTARGET = libcares.lib VERSION = $(LIBCARES_VERSION) -COPYR = Copyright (C) 1996 - 2006, Daniel Stenberg, <daniel@haxx.se> +COPYR = Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se> DESCR = cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se MTSAFE = YES STACK = 64000 diff --git a/lib/Makefile.netware b/lib/Makefile.netware index fe4b139d9..8316cc159 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -19,7 +19,12 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8c +OPENSSL_PATH = ../../openssl-0.9.8d +endif + +# Edit the path below to point to the base of your LibSSH2 package. +ifndef LIBSSH2_PATH +LIBSSH2_PATH = ../../libssh2-0.14 endif ifndef INSTDIR @@ -29,7 +34,7 @@ endif # Edit the vars below to change NLM target settings. TARGET = libcurl VERSION = $(LIBCURL_VERSION) -COPYR = Copyright (C) 1996 - 2006, Daniel Stenberg, <daniel@haxx.se> +COPYR = Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se> DESCR = cURL libcurl $(LIBCURL_VERSION_STR) - http://curl.haxx.se MTSAFE = YES STACK = 64000 @@ -121,6 +126,15 @@ ifdef WITH_SSL LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib IMPORTS += GetProcessSwitchCount RunningProcess endif +ifdef WITH_SSH2 + INCLUDES += -I$(LIBSSH2_PATH)/include +ifdef LINK_STATIC + LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.lib +else + IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp + MODULES += libssh2.nlm +endif +endif ifdef WITH_ZLIB INCLUDES += -I$(ZLIB_PATH) ifdef LINK_STATIC @@ -404,6 +418,11 @@ ifdef WITH_SSL @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@ @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@ endif +ifdef WITH_SSH2 + @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@ + @echo $(DL)#define HAVE_LIBSSH2 1$(DL) >> $@ + @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@ +endif ifdef OLD_NOVELLSDK @echo $(DL)#define socklen_t int$(DL) >> $@ endif diff --git a/src/Makefile.netware b/src/Makefile.netware index 28aa7582f..d863837e3 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -19,7 +19,12 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8c +OPENSSL_PATH = ../../openssl-0.9.8d +endif + +# Edit the path below to point to the base of your LibSSH2 package. +ifndef LIBSSH2_PATH +LIBSSH2_PATH = ../../libssh2-0.14 endif ifndef INSTDIR @@ -29,7 +34,7 @@ endif # Edit the vars below to change NLM target settings. TARGET = curl VERSION = $(LIBCURL_VERSION) -COPYR = Copyright (C) 1996 - 2006, Daniel Stenberg, <daniel@haxx.se> +COPYR = Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se> DESCR = cURL $(LIBCURL_VERSION_STR) - http://curl.haxx.se MTSAFE = YES STACK = 64000 @@ -379,6 +384,11 @@ ifdef WITH_SSL @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@ @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@ endif +ifdef WITH_SSH2 + @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@ + @echo $(DL)#define HAVE_LIBSSH2 1$(DL) >> $@ + @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@ +endif ifdef OLD_NOVELLSDK @echo $(DL)#define socklen_t int$(DL) >> $@ endif |