winbuild: add parameter WITH_SSH

For building with libssh
Closes #8514

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 098561333fadda017cb56ca1613c0dde6765921d..54da51e10348de4f6ed4eb1edee2055c22396094 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1999 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2022, 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
@@ -178,6 +178,14 @@ USE_SSH2 = true
 SSH2     = static
 !ENDIF
 
+!IF "$(WITH_SSH)"=="dll"
+USE_SSH = true
+SSH     = dll
+!ELSEIF "$(WITH_SSH)"=="static"
+USE_SSH = true
+SSH     = static
+!ENDIF
+
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)
 
 !IF "$(DEBUG)"=="yes"
@@ -212,6 +220,10 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-zlib-$(ZLIB)
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)
 !ENDIF
 
+!IF "$(USE_SSH)"=="true"
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh-$(SSH)
+!ENDIF
+
 !IF "$(USE_IPV6)"=="true"
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
 !ENDIF

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index fa26d7f1678d13d9dc77782c1d2a7577d9e9889e..c4b8fc94bd1c563c35b55196039208ffe243d89c 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.\r
 #\r
 # This software is licensed as described in the file COPYING, which\r
 # you should have received as part of this distribution. The terms\r
@@ -288,6 +288,27 @@ SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(SSH2_INC_DIR)
 !ENDIF\r
 \r
 \r
+!IFDEF SSH_PATH\r
+SSH_INC_DIR= $(SSH_PATH)\include\r
+SSH_LIB_DIR= $(SSH_PATH)\lib\r
+SSH_LFLAGS = $(SSH_LFLAGS) "/LIBPATH:$(SSH_LIB_DIR)"\r
+!ELSE\r
+SSH_LIB_DIR= $(DEVEL_LIB)\r
+SSH_INC_DIR= $(DEVEL_INCLUDE)\r
+!ENDIF\r
+\r
+!IF "$(WITH_SSH)"=="dll" || "$(WITH_SSH)"=="static"\r
+SSH_LIBS   = ssh.lib\r
+USE_SSH    = true\r
+SSH        = $(WITH_SSH)\r
+!ENDIF\r
+\r
+!IFDEF USE_SSH\r
+SSH_CFLAGS = /DHAVE_LIBSSH /DHAVE_LIBSSH_LIBSSH_H /DLIBSSH_WIN32 /DLIBSSH_LIBRARY /DUSE_LIBSSH /DCURL_USE_LIBSSH\r
+SSH_CFLAGS = $(SSH_CFLAGS) /I$(SSH_INC_DIR)\r
+!ENDIF\r
+\r
+\r
 !IFNDEF USE_IDN\r
 USE_IDN   = true\r
 !ELSEIF "$(USE_IDN)"=="yes"\r
@@ -449,6 +470,11 @@ CFLAGS = $(CFLAGS) $(SSH2_CFLAGS)
 LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS)\r
 !ENDIF\r
 \r
+!IF "$(USE_SSH)"=="true"\r
+CFLAGS = $(CFLAGS) $(SSH_CFLAGS)\r
+LFLAGS = $(LFLAGS) $(SSH_LFLAGS) $(SSH_LIBS)\r
+!ENDIF\r
+\r
 !IF "$(USE_IDN)"=="true"\r
 CFLAGS = $(CFLAGS) $(IDN_CFLAGS)\r
 !ENDIF\r
@@ -521,6 +547,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DIRDIST)
        @echo Using NGHTTP2: $(USE_NGHTTP2)\r
        @echo Using c-ares: $(USE_CARES)\r
        @echo Using SSH2: $(USE_SSH2)\r
+       @echo Using SSH: $(USE_SSH)\r
        @echo Using ZLIB: $(USE_ZLIB)\r
        @echo Using IDN:  $(USE_IDN)\r
        @echo Using IPv6: $(USE_IPV6)\r

diff --git a/winbuild/README.md b/winbuild/README.md
index 3684a382deb52e9f6c83e91107a996e00c4ce02c..7bbbc5c6c58dfb999431b60371cfc6e82c3f0730 100644 (file)
--- a/winbuild/README.md
+++ b/winbuild/README.md
@@ -83,6 +83,7 @@ where `<options>` is one or many of:
  - `WITH_MBEDTLS=<dll/static>`   - Enable mbedTLS support, DLL or static\r
  - `WITH_CARES=<dll/static>`     - Enable c-ares support, DLL or static\r
  - `WITH_ZLIB=<dll/static>`      - Enable zlib support, DLL or static\r
+ - `WITH_SSH=<dll/static>`       - Enable libSSH support, DLL or static\r
  - `WITH_SSH2=<dll/static>`      - Enable libSSH2 support, DLL or static\r
  - `WITH_PREFIX=<dir>`           - Where to install the build\r
  - `ENABLE_SSPI=<yes/no>`        - Enable SSPI support, defaults to yes\r