commit 020fbb23df7a58cf0d8e3a4bdd886c800cb1e800
author Frédéric Lécaille <flecaille@haproxy.com> Fri Jun 02 17:07:24 2023 +0200
committer William Lallemand <wlallemand@haproxy.org> Thu Sep 21 10:34:21 2023 +0200
tree fd76cd87bbb8cd705c9463207be27005e0fc60fd
parent 65a8b9aad132529487d56886afce1316f6424891

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.

(cherry picked from commit 2f155639a8335bdb8ef20e5fac85c8fadeecebc3)
Signed-off-by: William Lallemand <wlallemand@haproxy.org>

Makefile

diff --git a/Makefile b/Makefile
index 40eb875..8fafee6 100644
--- a/Makefile
+++ b/Makefile
@@ -315,7 +315,7 @@
            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)
@@ -612,6 +612,10 @@
                 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/")))