diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2016-04-06 11:57:48 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-04-06 11:58:34 +0200 |
| commit | a24f71aac4a3e94dac37208959cf2208c3d8f724 (patch) | |
| tree | b4b8e97f3bdad9eec51074c33d648f4243521c60 | |
| parent | 9c08b4f1e7eced5a4d3782a3e0daa484c9d77d21 (diff) | |
URLs: change http to https in many places
Closes #754
| -rw-r--r-- | docs/INSTALL | 2 | ||||
| -rw-r--r-- | docs/LICENSE-MIXING | 2 | ||||
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 | 4 | ||||
| -rw-r--r-- | lib/curl_ntlm_core.c | 2 | ||||
| -rw-r--r-- | lib/curl_ntlm_wb.c | 2 | ||||
| -rw-r--r-- | lib/http_ntlm.c | 2 | ||||
| -rw-r--r-- | lib/vauth/cleartext.c | 2 | ||||
| -rw-r--r-- | lib/vauth/cram.c | 2 | ||||
| -rw-r--r-- | lib/vauth/digest.c | 2 | ||||
| -rw-r--r-- | lib/vauth/digest.h | 2 | ||||
| -rw-r--r-- | lib/vauth/digest_sspi.c | 2 | ||||
| -rw-r--r-- | lib/vauth/krb5_sspi.c | 2 | ||||
| -rw-r--r-- | lib/vauth/ntlm.c | 2 | ||||
| -rw-r--r-- | lib/vauth/oauth2.c | 2 | ||||
| -rw-r--r-- | lib/vauth/spnego_gssapi.c | 2 | ||||
| -rw-r--r-- | lib/vauth/spnego_sspi.c | 2 | ||||
| -rw-r--r-- | lib/vauth/vauth.c | 2 | ||||
| -rw-r--r-- | lib/vauth/vauth.h | 2 | ||||
| -rw-r--r-- | winbuild/Makefile.vc | 416 |
19 files changed, 227 insertions, 227 deletions
diff --git a/docs/INSTALL b/docs/INSTALL index d316a1ae5..2e1075ba4 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -1101,7 +1101,7 @@ GnuTLS https://www.gnu.org/software/gnutls/ Heimdal http://www.h5l.org/ libidn https://www.gnu.org/software/libidn/ libmetalink https://launchpad.net/libmetalink/ -libssh2 http://www.libssh2.org/ +libssh2 https://www.libssh2.org/ MIT Kerberos http://web.mit.edu/kerberos/www/dist/ NSS https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS OpenLDAP http://www.openldap.org/ diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING index 68e7156d8..d8e36ca46 100644 --- a/docs/LICENSE-MIXING +++ b/docs/LICENSE-MIXING @@ -116,7 +116,7 @@ OpenLDAP http://www.openldap.org/software/release/license.html libcurl uses OpenLDAP as a shared library only, I have not heard of anyone that ships OpenLDAP linked with libcurl in an app. -libssh2 http://www.libssh2.org/ +libssh2 https://www.libssh2.org/ (Used for scp and sftp support) libssh2 uses a Modified BSD-style license. diff --git a/docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 b/docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 index 53b1770be..97940fbb3 100644 --- a/docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 +++ b/docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 @@ -5,11 +5,11 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms -.\" * are also available at http://curl.haxx.se/docs/copyright.html. +.\" * are also available at https://curl.haxx.se/docs/copyright.html. .\" * .\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell .\" * copies of the Software, and permit persons to whom the Software is diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index e79d1f64f..60a0bb4d7 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -28,7 +28,7 @@ * NTLM details: * * http://davenport.sourceforge.net/ntlm.html - * http://www.innovation.ch/java/ntlm.html + * https://www.innovation.ch/java/ntlm.html */ #if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c index 71bc08700..3defec7b5 100644 --- a/lib/curl_ntlm_wb.c +++ b/lib/curl_ntlm_wb.c @@ -29,7 +29,7 @@ * NTLM details: * * http://davenport.sourceforge.net/ntlm.html - * http://www.innovation.ch/java/ntlm.html + * https://www.innovation.ch/java/ntlm.html */ #define DEBUG_ME 0 diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c index 2cd3f4818..9ea5d70ee 100644 --- a/lib/http_ntlm.c +++ b/lib/http_ntlm.c @@ -28,7 +28,7 @@ * NTLM details: * * http://davenport.sourceforge.net/ntlm.html - * http://www.innovation.ch/java/ntlm.html + * https://www.innovation.ch/java/ntlm.html */ #define DEBUG_ME 0 diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c index 71b0442dd..a003f51de 100644 --- a/lib/vauth/cleartext.c +++ b/lib/vauth/cleartext.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c index 6f69e2ae9..cd02e04ba 100644 --- a/lib/vauth/cram.c +++ b/lib/vauth/cram.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index 56db592c1..72cf04829 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h index d2c48687a..5722dcece 100644 --- a/lib/vauth/digest.h +++ b/lib/vauth/digest.h @@ -11,7 +11,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index 364fb9b42..d13d08e56 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -10,7 +10,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index c835ae141..bf56a64e7 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c index e27ce59be..e27f4237b 100644 --- a/lib/vauth/ntlm.c +++ b/lib/vauth/ntlm.c @@ -28,7 +28,7 @@ * NTLM details: * * http://davenport.sourceforge.net/ntlm.html - * http://www.innovation.ch/java/ntlm.html + * https://www.innovation.ch/java/ntlm.html */ #define DEBUG_ME 0 diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c index 0c80c8bb4..fccdfb86c 100644 --- a/lib/vauth/oauth2.c +++ b/lib/vauth/oauth2.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index 4821fc7be..739e35b6e 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index 905132fd2..797466470 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c index db44d2913..702e2d4bc 100644 --- a/lib/vauth/vauth.c +++ b/lib/vauth/vauth.c @@ -9,7 +9,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h index d3900fbc1..2c5131c70 100644 --- a/lib/vauth/vauth.h +++ b/lib/vauth/vauth.h @@ -11,7 +11,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 5653232d2..4f90e4a2a 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -1,208 +1,208 @@ -!IF "$(MODE)"=="static"
-TARGET = $(LIB_NAME_STATIC)
-AS_DLL = false
-CFGSET=true
-!ELSEIF "$(MODE)"=="dll"
-TARGET = $(LIB_NAME_DLL)
-AS_DLL = true
-CFGSET=true
-!ELSE
-!MESSAGE Invalid mode: $(MODE)
-
-#######################
-# Usage
-#
-
-!MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options>
-!MESSAGE where <options> is one or many of:
-!MESSAGE VC=<6,7,8,9,10,11,12,14> - VC versions
-!MESSAGE WITH_DEVEL=<path> - Paths for the development files (SSL, zlib, etc.)
-!MESSAGE Defaults to sibbling directory deps: ../deps
-!MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/
-!MESSAGE Uncompress them into the deps folder.
-!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static
-!MESSAGE WITH_CARES=<dll or static> - Enable c-ares support, DLL or static
-!MESSAGE WITH_ZLIB=<dll or static> - Enable zlib support, DLL or static
-!MESSAGE WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static
-!MESSAGE ENABLE_IDN=<yes or no> - Enable use of Windows IDN APIs, defaults to yes
-!MESSAGE Requires Windows Vista or later, or installation from:
-!MESSAGE http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
-!MESSAGE ENABLE_IPV6=<yes or no> - Enable IPv6, defaults to yes
-!MESSAGE ENABLE_SSPI=<yes or no> - Enable SSPI support, defaults to yes
-!MESSAGE ENABLE_WINSSL=<yes or no> - Enable native Windows SSL support, defaults to yes
-!MESSAGE GEN_PDB=<yes or no> - Generate Program Database (debug symbols for release build)
-!MESSAGE DEBUG=<yes or no> - Debug builds
-!MESSAGE MACHINE=<x86 or x64> - Target architecture (default x64 on AMD64, x86 on others)
-!ERROR please choose a valid mode
-
-!ENDIF
-
-!INCLUDE "../lib/Makefile.inc"
-LIBCURL_OBJS=$(CSOURCES:.c=.obj)
-
-!INCLUDE "../src/Makefile.inc"
-
-# tool_hugehelp has a special rule
-CURL_OBJS=$(CURL_CFILES:tool_hugehelp.c=)
-
-CURL_OBJS=$(CURL_OBJS:.c=.obj)
-
-
-# backwards compatible check for USE_SSPI
-!IFDEF USE_SSPI
-ENABLE_SSPI = $(USE_SSPI)
-!ENDIF
-
-# default options
-!IFNDEF MACHINE
-!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"
-MACHINE = x64
-!ELSE
-MACHINE = x86
-!ENDIF
-!ENDIF
-
-!IFNDEF ENABLE_IDN
-USE_IDN = true
-!ELSEIF "$(ENABLE_IDN)"=="yes"
-USE_IDN = true
-!ELSEIF "$(ENABLE_IDN)"=="no"
-USE_IDN = false
-!ENDIF
-
-!IFNDEF ENABLE_IPV6
-USE_IPV6 = true
-!ELSEIF "$(ENABLE_IPV6)"=="yes"
-USE_IPV6 = true
-!ELSEIF "$(ENABLE_IPV6)"=="no"
-USE_IPV6 = false
-!ENDIF
-
-!IFNDEF ENABLE_SSPI
-USE_SSPI = true
-!ELSEIF "$(ENABLE_SSPI)"=="yes"
-USE_SSPI = true
-!ELSEIF "$(ENABLE_SSPI)"=="no"
-USE_SSPI = false
-!ENDIF
-
-!IFNDEF ENABLE_WINSSL
-!IFDEF WITH_SSL
-USE_WINSSL = false
-!ELSE
-USE_WINSSL = $(USE_SSPI)
-!ENDIF
-!ELSEIF "$(ENABLE_WINSSL)"=="yes"
-USE_WINSSL = true
-!ELSEIF "$(ENABLE_WINSSL)"=="no"
-USE_WINSSL = false
-!ENDIF
-
-CONFIG_NAME_LIB = libcurl
-
-!IF "$(WITH_SSL)"=="dll"
-USE_SSL = true
-SSL = dll
-!ELSEIF "$(WITH_SSL)"=="static"
-USE_SSL = true
-SSL = static
-!ENDIF
-
-!IF "$(WITH_CARES)"=="dll"
-USE_CARES = true
-CARES = dll
-!ELSEIF "$(WITH_CARES)"=="static"
-USE_CARES = true
-CARES = static
-!ENDIF
-
-!IF "$(WITH_ZLIB)"=="dll"
-USE_ZLIB = true
-ZLIB = dll
-!ELSEIF "$(WITH_ZLIB)"=="static"
-USE_ZLIB = true
-ZLIB = static
-!ENDIF
-
-!IF "$(WITH_SSH2)"=="dll"
-USE_SSH2 = true
-SSH2 = dll
-!ELSEIF "$(WITH_SSH2)"=="static"
-USE_SSH2 = true
-SSH2 = static
-!ENDIF
-
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)
-
-!IF "$(DEBUG)"=="yes"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug
-!ELSE
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release
-!ENDIF
-
-!IF "$(AS_DLL)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll
-!ELSE
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static
-!ENDIF
-
-!IF "$(USE_SSL)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssl-$(SSL)
-!ENDIF
-
-!IF "$(USE_CARES)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-cares-$(CARES)
-!ENDIF
-
-!IF "$(USE_ZLIB)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-zlib-$(ZLIB)
-!ENDIF
-
-!IF "$(USE_SSH2)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)
-!ENDIF
-
-!IF "$(USE_IPV6)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
-!ENDIF
-
-!IF "$(USE_SSPI)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
-!ENDIF
-
-!IF "$(USE_WINSSL)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl
-!ENDIF
-
-!MESSAGE configuration name: $(CONFIG_NAME_LIB)
-
-BUILD_DIR=../builds/$(CONFIG_NAME_LIB)
-LIBCURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib
-CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
-DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
-
-$(MODE):
- @IF NOT EXIST ..\include\curl\curlbuild.h ( \
- CALL ..\buildconf.bat \
- )
- @SET DIROBJ=$(LIBCURL_DIROBJ)
- @SET MACRO_NAME=LIBCURL_OBJS
- @SET OUTFILE=LIBCURL_OBJS.inc
- @gen_resp_file.bat $(LIBCURL_OBJS)
-
- @SET DIROBJ=$(CURL_DIROBJ)
- @SET MACRO_NAME=CURL_OBJS
- @SET OUTFILE=CURL_OBJS.inc
- @gen_resp_file.bat $(CURL_OBJS)
-
- @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
- @SET MACHINE=$(MACHINE)
- @SET USE_IDN=$(USE_IDN)
- @SET USE_IPV6=$(USE_IPV6)
- @SET USE_SSPI=$(USE_SSPI)
- @SET USE_WINSSL=$(USE_WINSSL)
- @$(MAKE) /NOLOGO /F MakefileBuild.vc
-
-copy_from_lib:
- echo copying .c...
- FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\
+!IF "$(MODE)"=="static" +TARGET = $(LIB_NAME_STATIC) +AS_DLL = false +CFGSET=true +!ELSEIF "$(MODE)"=="dll" +TARGET = $(LIB_NAME_DLL) +AS_DLL = true +CFGSET=true +!ELSE +!MESSAGE Invalid mode: $(MODE) + +####################### +# Usage +# + +!MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options> +!MESSAGE where <options> is one or many of: +!MESSAGE VC=<6,7,8,9,10,11,12,14> - VC versions +!MESSAGE WITH_DEVEL=<path> - Paths for the development files (SSL, zlib, etc.) +!MESSAGE Defaults to sibbling directory deps: ../deps +!MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ +!MESSAGE Uncompress them into the deps folder. +!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static +!MESSAGE WITH_CARES=<dll or static> - Enable c-ares support, DLL or static +!MESSAGE WITH_ZLIB=<dll or static> - Enable zlib support, DLL or static +!MESSAGE WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static +!MESSAGE ENABLE_IDN=<yes or no> - Enable use of Windows IDN APIs, defaults to yes +!MESSAGE Requires Windows Vista or later, or installation from: +!MESSAGE https://www.microsoft.com/en-us/download/details.aspx?id=734 +!MESSAGE ENABLE_IPV6=<yes or no> - Enable IPv6, defaults to yes +!MESSAGE ENABLE_SSPI=<yes or no> - Enable SSPI support, defaults to yes +!MESSAGE ENABLE_WINSSL=<yes or no> - Enable native Windows SSL support, defaults to yes +!MESSAGE GEN_PDB=<yes or no> - Generate Program Database (debug symbols for release build) +!MESSAGE DEBUG=<yes or no> - Debug builds +!MESSAGE MACHINE=<x86 or x64> - Target architecture (default x64 on AMD64, x86 on others) +!ERROR please choose a valid mode + +!ENDIF + +!INCLUDE "../lib/Makefile.inc" +LIBCURL_OBJS=$(CSOURCES:.c=.obj) + +!INCLUDE "../src/Makefile.inc" + +# tool_hugehelp has a special rule +CURL_OBJS=$(CURL_CFILES:tool_hugehelp.c=) + +CURL_OBJS=$(CURL_OBJS:.c=.obj) + + +# backwards compatible check for USE_SSPI +!IFDEF USE_SSPI +ENABLE_SSPI = $(USE_SSPI) +!ENDIF + +# default options +!IFNDEF MACHINE +!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64" +MACHINE = x64 +!ELSE +MACHINE = x86 +!ENDIF +!ENDIF + +!IFNDEF ENABLE_IDN +USE_IDN = true +!ELSEIF "$(ENABLE_IDN)"=="yes" +USE_IDN = true +!ELSEIF "$(ENABLE_IDN)"=="no" +USE_IDN = false +!ENDIF + +!IFNDEF ENABLE_IPV6 +USE_IPV6 = true +!ELSEIF "$(ENABLE_IPV6)"=="yes" +USE_IPV6 = true +!ELSEIF "$(ENABLE_IPV6)"=="no" +USE_IPV6 = false +!ENDIF + +!IFNDEF ENABLE_SSPI +USE_SSPI = true +!ELSEIF "$(ENABLE_SSPI)"=="yes" +USE_SSPI = true +!ELSEIF "$(ENABLE_SSPI)"=="no" +USE_SSPI = false +!ENDIF + +!IFNDEF ENABLE_WINSSL +!IFDEF WITH_SSL +USE_WINSSL = false +!ELSE +USE_WINSSL = $(USE_SSPI) +!ENDIF +!ELSEIF "$(ENABLE_WINSSL)"=="yes" +USE_WINSSL = true +!ELSEIF "$(ENABLE_WINSSL)"=="no" +USE_WINSSL = false +!ENDIF + +CONFIG_NAME_LIB = libcurl + +!IF "$(WITH_SSL)"=="dll" +USE_SSL = true +SSL = dll +!ELSEIF "$(WITH_SSL)"=="static" +USE_SSL = true +SSL = static +!ENDIF + +!IF "$(WITH_CARES)"=="dll" +USE_CARES = true +CARES = dll +!ELSEIF "$(WITH_CARES)"=="static" +USE_CARES = true +CARES = static +!ENDIF + +!IF "$(WITH_ZLIB)"=="dll" +USE_ZLIB = true +ZLIB = dll +!ELSEIF "$(WITH_ZLIB)"=="static" +USE_ZLIB = true +ZLIB = static +!ENDIF + +!IF "$(WITH_SSH2)"=="dll" +USE_SSH2 = true +SSH2 = dll +!ELSEIF "$(WITH_SSH2)"=="static" +USE_SSH2 = true +SSH2 = static +!ENDIF + +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE) + +!IF "$(DEBUG)"=="yes" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug +!ELSE +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release +!ENDIF + +!IF "$(AS_DLL)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll +!ELSE +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static +!ENDIF + +!IF "$(USE_SSL)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssl-$(SSL) +!ENDIF + +!IF "$(USE_CARES)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-cares-$(CARES) +!ENDIF + +!IF "$(USE_ZLIB)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-zlib-$(ZLIB) +!ENDIF + +!IF "$(USE_SSH2)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2) +!ENDIF + +!IF "$(USE_IPV6)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6 +!ENDIF + +!IF "$(USE_SSPI)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi +!ENDIF + +!IF "$(USE_WINSSL)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl +!ENDIF + +!MESSAGE configuration name: $(CONFIG_NAME_LIB) + +BUILD_DIR=../builds/$(CONFIG_NAME_LIB) +LIBCURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib +CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl +DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\ + +$(MODE): + @IF NOT EXIST ..\include\curl\curlbuild.h ( \ + CALL ..\buildconf.bat \ + ) + @SET DIROBJ=$(LIBCURL_DIROBJ) + @SET MACRO_NAME=LIBCURL_OBJS + @SET OUTFILE=LIBCURL_OBJS.inc + @gen_resp_file.bat $(LIBCURL_OBJS) + + @SET DIROBJ=$(CURL_DIROBJ) + @SET MACRO_NAME=CURL_OBJS + @SET OUTFILE=CURL_OBJS.inc + @gen_resp_file.bat $(CURL_OBJS) + + @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB) + @SET MACHINE=$(MACHINE) + @SET USE_IDN=$(USE_IDN) + @SET USE_IPV6=$(USE_IPV6) + @SET USE_SSPI=$(USE_SSPI) + @SET USE_WINSSL=$(USE_WINSSL) + @$(MAKE) /NOLOGO /F MakefileBuild.vc + +copy_from_lib: + echo copying .c... + FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\ |