From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Fri, 2 Jun 2023 15:07:24 +0000 (+0200)
Subject: MINOR: quic: Add a compilation option for the QUIC OpenSSL wrapper
X-Git-Tag: v2.9-dev2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f155639a8335bdb8ef20e5fac85c8fadeecebc3;p=thirdparty%2Fhaproxy.git

MINOR: quic: Add a compilation option for the QUIC OpenSSL wrapper

Add USE_QUIC_OPENSSL_COMPAT new compilation option to support the
QUIC OpenSSL wrapper build.
---

diff --git a/Makefile b/Makefile
index 11096c2236..c32e992e4a 100644
--- a/Makefile
+++ b/Makefile
@@ -313,7 +313,7 @@ use_opts = USE_EPOLL USE_KQUEUE USE_NETFILTER USE_POLL                        \
            USE_THREAD_DUMP USE_EVPORTS USE_OT USE_QUIC USE_PROMEX             \
            USE_MEMORY_PROFILING USE_SHM_OPEN                                  \
            USE_STATIC_PCRE USE_STATIC_PCRE2                                   \
-           USE_PCRE USE_PCRE_JIT USE_PCRE2 USE_PCRE2_JIT
+           USE_PCRE USE_PCRE_JIT USE_PCRE2 USE_PCRE2_JIT USE_QUIC_OPENSSL_COMPAT
 
 # preset all variables for all supported build options among use_opts
 $(reset_opts_vars)
@@ -610,6 +610,10 @@ OPTIONS_OBJS += src/quic_conn.o src/mux_quic.o src/h3.o src/xprt_quic.o    \
                 src/cbuf.o src/quic_cc.o src/quic_cc_nocc.o
 endif
 
+ifneq ($(USE_QUIC_OPENSSL_COMPAT),)
+OPTIONS_OBJS += src/quic_openssl_compat.o
+endif
+
 ifneq ($(USE_LUA),)
   check_lua_inc = $(shell if [ -d $(2)$(1) ]; then echo $(2)$(1); fi;)
   LUA_INC      := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))