Added NetWare support to build with nghttp2.

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 94c298e2b85f6d386ec845f57d433a463f3d1398..d6be5379908245e38d7f330f4d020b6ab01ee035 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH
 LIBRTMP_PATH = ../../librtmp-2.3
 endif
 
+# Edit the path below to point to the base of your nghttp2 package.
+ifndef NGHTTP2_PATH
+NGHTTP2_PATH = ../../nghttp2-0.6.4
+endif
+
 # Edit the path below to point to the base of your fbopenssl package.
 ifndef FBOPENSSL_PATH
 FBOPENSSL_PATH = ../../fbopenssl-0.4
@@ -217,6 +222,9 @@ endif
 ifeq ($(findstring -idn,$(CFG)),-idn)
 WITH_IDN = 1
 endif
+ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
+WITH_NGHTTP2 = 1
+endif
 ifeq ($(findstring -ipv6,$(CFG)),-ipv6)
 ENABLE_IPV6 = 1
 endif
@@ -269,6 +277,10 @@ ifdef WITH_IDN
        INCLUDES += -I$(LIBIDN_PATH)/include
        LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
 endif
+ifdef WITH_NGHTTP2
+       INCLUDES += -I$(NGHTTP2_PATH)/include
+       LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
+endif
 
 ifeq ($(LIBARCH),LIBC)
        INCLUDES += -I$(NDK_LIBC)/include
@@ -644,6 +656,9 @@ ifdef WITH_IDN
 endif
 ifdef WITH_RTMP
        @echo $(DL)#define USE_LIBRTMP 1$(DL) >> $@
+endif
+ifdef WITH_NGHTTP2
+       @echo $(DL)#define USE_NGHTTP2 1$(DL) >> $@
 endif
        @echo $(DL)#ifdef __GNUC__$(DL) >> $@
        @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
@@ -685,6 +700,11 @@ ifdef WITH_ZLIB
 else
        @echo zlib support:    no
 endif
+ifdef WITH_NGHTTP2
+       @echo http2 support:   enabled
+else
+       @echo http2 support:   no
+endif
 ifdef WITH_ARES
        @echo c-ares support:  enabled
 else

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 63b858e313748db3abefb6ba87bdc30ffd6bffeb..5b0c16bfe22ceaeb359fe1b3825dd14d77fc1c14 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH
 LIBRTMP_PATH = ../../librtmp-2.3
 endif
 
+# Edit the path below to point to the base of your nghttp2 package.
+ifndef NGHTTP2_PATH
+NGHTTP2_PATH = ../../nghttp2-0.6.4
+endif
+
 # Edit the path below to point to the base of your fbopenssl package.
 ifndef FBOPENSSL_PATH
 FBOPENSSL_PATH = ../../fbopenssl-0.4
@@ -230,6 +235,9 @@ ifeq ($(findstring -metalink,$(CFG)),-metalink)
 WITH_METALINK = 1
 WITH_SSL = 1
 endif
+ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
+WITH_NGHTTP2 = 1
+endif
 ifeq ($(findstring -ipv6,$(CFG)),-ipv6)
 ENABLE_IPV6 = 1
 endif
@@ -287,6 +295,10 @@ ifdef WITH_IDN
        # INCLUDES += -I$(LIBIDN_PATH)/include
        LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
 endif
+ifdef WITH_NGHTTP2
+       INCLUDES += -I$(NGHTTP2_PATH)/include
+       LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
+endif
 ifdef WITH_METALINK
        CFLAGS += -DUSE_METALINK
        INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)