mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
enabled build with libssh2; fixed copyright for new year..
This commit is contained in:
parent
6da70628c6
commit
9ab7cda010
@ -20,7 +20,7 @@ endif
|
|||||||
TARGETS = adig.nlm ahost.nlm
|
TARGETS = adig.nlm ahost.nlm
|
||||||
LTARGET = libcares.lib
|
LTARGET = libcares.lib
|
||||||
VERSION = $(LIBCARES_VERSION)
|
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
|
DESCR = cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
|
||||||
MTSAFE = YES
|
MTSAFE = YES
|
||||||
STACK = 64000
|
STACK = 64000
|
||||||
|
@ -19,7 +19,12 @@ endif
|
|||||||
|
|
||||||
# Edit the path below to point to the base of your OpenSSL package.
|
# Edit the path below to point to the base of your OpenSSL package.
|
||||||
ifndef OPENSSL_PATH
|
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
|
endif
|
||||||
|
|
||||||
ifndef INSTDIR
|
ifndef INSTDIR
|
||||||
@ -29,7 +34,7 @@ endif
|
|||||||
# Edit the vars below to change NLM target settings.
|
# Edit the vars below to change NLM target settings.
|
||||||
TARGET = libcurl
|
TARGET = libcurl
|
||||||
VERSION = $(LIBCURL_VERSION)
|
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
|
DESCR = cURL libcurl $(LIBCURL_VERSION_STR) - http://curl.haxx.se
|
||||||
MTSAFE = YES
|
MTSAFE = YES
|
||||||
STACK = 64000
|
STACK = 64000
|
||||||
@ -121,6 +126,15 @@ ifdef WITH_SSL
|
|||||||
LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib
|
LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib
|
||||||
IMPORTS += GetProcessSwitchCount RunningProcess
|
IMPORTS += GetProcessSwitchCount RunningProcess
|
||||||
endif
|
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
|
ifdef WITH_ZLIB
|
||||||
INCLUDES += -I$(ZLIB_PATH)
|
INCLUDES += -I$(ZLIB_PATH)
|
||||||
ifdef LINK_STATIC
|
ifdef LINK_STATIC
|
||||||
@ -404,6 +418,11 @@ ifdef WITH_SSL
|
|||||||
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
|
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
|
||||||
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
|
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
|
||||||
endif
|
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
|
ifdef OLD_NOVELLSDK
|
||||||
@echo $(DL)#define socklen_t int$(DL) >> $@
|
@echo $(DL)#define socklen_t int$(DL) >> $@
|
||||||
endif
|
endif
|
||||||
|
@ -19,7 +19,12 @@ endif
|
|||||||
|
|
||||||
# Edit the path below to point to the base of your OpenSSL package.
|
# Edit the path below to point to the base of your OpenSSL package.
|
||||||
ifndef OPENSSL_PATH
|
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
|
endif
|
||||||
|
|
||||||
ifndef INSTDIR
|
ifndef INSTDIR
|
||||||
@ -29,7 +34,7 @@ endif
|
|||||||
# Edit the vars below to change NLM target settings.
|
# Edit the vars below to change NLM target settings.
|
||||||
TARGET = curl
|
TARGET = curl
|
||||||
VERSION = $(LIBCURL_VERSION)
|
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
|
DESCR = cURL $(LIBCURL_VERSION_STR) - http://curl.haxx.se
|
||||||
MTSAFE = YES
|
MTSAFE = YES
|
||||||
STACK = 64000
|
STACK = 64000
|
||||||
@ -379,6 +384,11 @@ ifdef WITH_SSL
|
|||||||
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
|
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
|
||||||
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
|
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
|
||||||
endif
|
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
|
ifdef OLD_NOVELLSDK
|
||||||
@echo $(DL)#define socklen_t int$(DL) >> $@
|
@echo $(DL)#define socklen_t int$(DL) >> $@
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user