From: Willy Tarreau <w@1wt.eu>
Date: Wed, 14 Dec 2022 17:38:58 +0000 (+0100)
Subject: BUILD: makefile: make sure to also ignore SSL_INC when using wolfssl
X-Git-Tag: v2.8-dev1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914a668077f6dfdefcf0f3768d57f8e9858b828c;p=thirdparty%2Fhaproxy.git

BUILD: makefile: make sure to also ignore SSL_INC when using wolfssl

I got a build error when adding USE_OPENSSL_WOLFSSL to my make command
line because SSL_INC was still set and caused some conflicting headers
to be included first. There's already an exclusion test for the wolfssl
variant used for SSL_LIB, make it also cover SSL_INC to avoid this.

This may be backported to 2.7 to ease testing of wolfssl.
---

diff --git a/Makefile b/Makefile
index e68f3f766c..c464e78349 100644
--- a/Makefile
+++ b/Makefile
@@ -568,8 +568,8 @@ ifneq ($(USE_OPENSSL),)
 # reason why it's added by default. Some even need -lz, then you'll need to
 # pass it in the "ADDLIB" variable if needed. If your SSL libraries are not
 # in the usual path, use SSL_INC=/path/to/inc and SSL_LIB=/path/to/lib.
-OPTIONS_CFLAGS  += $(if $(SSL_INC),-I$(SSL_INC))
 ifeq ($(USE_OPENSSL_WOLFSSL),)
+OPTIONS_CFLAGS  += $(if $(SSL_INC),-I$(SSL_INC))
 OPTIONS_LDFLAGS += $(if $(SSL_LIB),-L$(SSL_LIB)) -lssl -lcrypto
 endif
 ifneq ($(USE_DL),)