winbuild: add config option ENABLE_NGHTTP2

Closes #1141

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index bd5c8e0323f4f876fb4726db84cca025b004f547..1443dfa02e246da3e4e3ed855e9deb1a5287faf2 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -21,6 +21,8 @@ CFGSET=true
 !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   ENABLE_NGHTTP2=<yes or no>   - Enable HTTP/2 support, defaults to no
+!MESSAGE                                  Requires OpenSSL
 !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
@@ -109,6 +111,16 @@ USE_SSL = true
 SSL     = static
 !ENDIF
 
+!IF "$(USE_SSL)"=="true"
+!IF "$(ENABLE_NGHTTP2)"=="yes"
+USE_NGHTTP2 = true
+!ENDIF
+!ENDIF
+
+!IFNDEF USE_NGHTTP2
+USE_NGHTTP2 = false
+!ENDIF
+
 !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"
 USE_MBEDTLS = true
 MBEDTLS     = $(WITH_MBEDTLS)
@@ -213,6 +225,7 @@ $(MODE):
 
        @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
        @SET MACHINE=$(MACHINE)
+       @SET USE_NGHTTP2=$(USE_NGHTTP2)
        @SET USE_IDN=$(USE_IDN)
        @SET USE_IPV6=$(USE_IPV6)
        @SET USE_SSPI=$(USE_SSPI)

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index a410d2464a4ab37387944807df51fc98268e5bf9..96ab37ef8a44ffcaff1c1b725b31ebcc0e425d12 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -123,8 +123,22 @@ USE_SSL      = true
 SSL          = static\r
 !ENDIF\r
 \r
+!IFNDEF USE_NGHTTP2\r
+USE_NGHTTP2  = false\r
+!ENDIF\r
+\r
 !IFDEF USE_SSL\r
 SSL_CFLAGS   = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"\r
+\r
+!IF "$(USE_NGHTTP2)"=="yes"\r
+USE_NGHTTP2  = true\r
+!ENDIF\r
+\r
+!IF "$(USE_NGHTTP2)"=="true"\r
+SSL_CFLAGS   = $(SSL_CFLAGS) /DUSE_NGHTTP2\r
+SSL_LIBS     = $(SSL_LIBS) nghttp2.lib\r
+!ENDIF\r
+\r
 !ENDIF\r
 \r
 !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"\r
@@ -416,6 +430,7 @@ package: $(TARGET)
 \r
 $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)\r
        @echo Using SSL: $(USE_SSL)\r
+       @echo Using NGHTTP2: $(USE_NGHTTP2)\r
        @echo Using c-ares: $(USE_CARES)\r
        @echo Using SSH2: $(USE_SSH2)\r
        @echo Using ZLIB: $(USE_ZLIB)\r