[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 251/411: Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3
From: |
gnunet |
Subject: |
[gnurl] 251/411: Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3 |
Date: |
Wed, 13 Jan 2021 01:21:06 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit 769c9a4eecba87c366ae8490ceeb9a02c5c6813e
Author: Viktor Szakats <commit@vsz.me>
AuthorDate: Fri Oct 16 07:15:19 2020 +0000
Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3
Approved-by: Daniel Stenberg
Closes #6092
---
docs/examples/Makefile.m32 | 23 +++++++++++++++++++++++
lib/Makefile.m32 | 25 +++++++++++++++++++++++++
src/Makefile.m32 | 23 +++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index a2dca6bbc..57d100dd7 100644
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -89,6 +89,14 @@ endif
ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../../nghttp2-1.0.0
endif
+# Edit the path below to point to the base of your nghttp3 package.
+ifndef NGHTTP3_PATH
+NGHTTP3_PATH = ../../../nghttp3-1.0.0
+endif
+# Edit the path below to point to the base of your ngtcp2 package.
+ifndef NGTCP2_PATH
+NGTCP2_PATH = ../../../ngtcp2-1.0.0
+endif
PROOT = ../..
@@ -215,6 +223,12 @@ endif
ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
NGHTTP2 = 1
endif
+ifeq ($(findstring -nghttp3,$(CFG)),-nghttp3)
+NGHTTP3 = 1
+endif
+ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
+NGTCP2 = 1
+endif
INCLUDES = -I. -I$(PROOT) -I$(PROOT)/include -I$(PROOT)/lib
@@ -252,6 +266,15 @@ ifdef SSH2
endif
endif
ifdef SSL
+ ifdef NGHTTP3
+ CFLAGS += -DUSE_NGHTTP3
+ curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
+ ifdef NGTCP2
+ CFLAGS += -DUSE_NGTCP2
+ curl_LDADD += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl
+ endif
+ endif
+
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 37887eed5..dcb0b8801 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -77,6 +77,14 @@ endif
ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-1.0.0
endif
+# Edit the path below to point to the base of your nghttp3 package.
+ifndef NGHTTP3_PATH
+NGHTTP3_PATH = ../../nghttp3-1.0.0
+endif
+# Edit the path below to point to the base of your ngtcp2 package.
+ifndef NGTCP2_PATH
+NGTCP2_PATH = ../../ngtcp2-1.0.0
+endif
PROOT = ..
@@ -212,6 +220,12 @@ endif
ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
NGHTTP2 = 1
endif
+ifeq ($(findstring -nghttp3,$(CFG)),-nghttp3)
+NGHTTP3 = 1
+endif
+ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
+NGTCP2 = 1
+endif
INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL
@@ -252,6 +266,17 @@ ifdef SSH2
endif
endif
ifdef SSL
+ ifdef NGHTTP3
+ INCLUDES += -I"$(NGHTTP3_PATH)/include"
+ CFLAGS += -DUSE_NGHTTP3
+ DLL_LIBS += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
+ ifdef NGTCP2
+ INCLUDES += -I"$(NGTCP2_PATH)/include"
+ CFLAGS += -DUSE_NGTCP2
+ DLL_LIBS += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl
+ endif
+ endif
+
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index b3fcae5cf..f535d7632 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -89,6 +89,14 @@ endif
ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-1.0.0
endif
+# Edit the path below to point to the base of your nghttp3 package.
+ifndef NGHTTP3_PATH
+NGHTTP3_PATH = ../../nghttp3-1.0.0
+endif
+# Edit the path below to point to the base of your ngtcp2 package.
+ifndef NGTCP2_PATH
+NGTCP2_PATH = ../../ngtcp2-1.0.0
+endif
PROOT = ..
@@ -224,6 +232,12 @@ endif
ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
NGHTTP2 = 1
endif
+ifeq ($(findstring -nghttp3,$(CFG)),-nghttp3)
+NGHTTP3 = 1
+endif
+ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
+NGTCP2 = 1
+endif
INCLUDES = -I. -I../include -I../lib
ifdef SSL
@@ -270,6 +284,15 @@ ifdef SSH2
endif
endif
ifdef SSL
+ ifdef NGHTTP3
+ CFLAGS += -DUSE_NGHTTP3
+ curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
+ ifdef NGTCP2
+ CFLAGS += -DUSE_NGTCP2
+ curl_LDADD += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl
+ endif
+ endif
+
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 275/411: range.d: clarify that curl will not parse multipart responses, (continued)
- [gnurl] 275/411: range.d: clarify that curl will not parse multipart responses, gnunet, 2021/01/12
- [gnurl] 347/411: KNOWN_BUGS: cmake uses -lpthread instead of Threads::Threads, gnunet, 2021/01/12
- [gnurl] 353/411: quiche: remove 'static' from local buffer, gnunet, 2021/01/12
- [gnurl] 193/411: sendf: move Curl_sendf to dict.c and make it static, gnunet, 2021/01/12
- [gnurl] 205/411: include/README: convert to markdown, gnunet, 2021/01/12
- [gnurl] 258/411: os400: Sync libcurl API options, gnunet, 2021/01/12
- [gnurl] 346/411: KNOWN_BUGS: cmake build in Linux links libcurl to libdl, gnunet, 2021/01/12
- [gnurl] 312/411: HISTORY: the new domain, gnunet, 2021/01/12
- [gnurl] 279/411: runtests: show keywords when no tests ran, gnunet, 2021/01/12
- [gnurl] 188/411: pause: only trigger a reread if the unpause sticks, gnunet, 2021/01/12
- [gnurl] 251/411: Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3,
gnunet <=
- [gnurl] 198/411: ECH: renamed from ESNI in docs and configure, gnunet, 2021/01/12
- [gnurl] 244/411: strerror: use 'const' as the string should never be modified, gnunet, 2021/01/12
- [gnurl] 223/411: scripts/release-notes.pl: don't "embed" $ in format string for printf(), gnunet, 2021/01/12
- [gnurl] 231/411: windows: fix comparison of mismatched types warning, gnunet, 2021/01/12
- [gnurl] 348/411: KNOWN_BUGS: cmake: generated .pc file contains strange entries, gnunet, 2021/01/12
- [gnurl] 318/411: hsts: remove debug code leftovers, gnunet, 2021/01/12
- [gnurl] 331/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 374/411: runtests: make 'c-ares' a "feature" to depend on, gnunet, 2021/01/12
- [gnurl] 378/411: vquic/ngtcp2.h: define local_addr as sockaddr_storage, gnunet, 2021/01/12
- [gnurl] 200/411: HISTORY: add some 2020 events, gnunet, 2021/01/12