diff options
| author | Guenter Knauf <lists@gknw.net> | 2014-10-29 03:31:34 +0100 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2014-10-29 03:31:34 +0100 |
| commit | b5ed5843a4fb5ac4d7f2deadcefe6022605c3ae8 (patch) | |
| tree | f08aa90b504012f899d1d277e2dd6093997c3316 | |
| parent | 357a15a6492ac0496abe952fae70aef7da017158 (diff) | |
| download | gnurl-b5ed5843a4fb5ac4d7f2deadcefe6022605c3ae8.tar.gz gnurl-b5ed5843a4fb5ac4d7f2deadcefe6022605c3ae8.tar.bz2 gnurl-b5ed5843a4fb5ac4d7f2deadcefe6022605c3ae8.zip | |
Added NetWare support to build with nghttp2.
| -rw-r--r-- | lib/Makefile.netware | 20 | ||||
| -rw-r--r-- | src/Makefile.netware | 12 |
2 files changed, 32 insertions, 0 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 94c298e2b..d6be53799 100644 --- 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 @@ -645,6 +657,9 @@ 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) >> $@ @echo $(DL)#else$(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 63b858e31..5b0c16bfe 100644 --- 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) |