From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 11 Jun 2020 18:11:28 +0000 (+0200)
Subject: Don't add '-Imbedtls/include' to the CFLAGS when not building with mbedTLS
X-Git-Tag: v_3_0_29~276
X-Git-Url: http://www.privoxy.org/gitweb/templates.html?a=commitdiff_plain;h=82a46da2782251648167bf921045db0fd8ba9ca8;p=privoxy.git

Don't add '-Imbedtls/include' to the CFLAGS when not building with mbedTLS

Sponsored by: Robert Klemme
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 92ef0a16..40b5706b 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -280,7 +280,6 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@
 OTHER_CFLAGS =
 
 CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
-         -Imbedtls/include \
          @STATIC_PCRE_ONLY@ -Ipcre
 
 LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
diff --git a/configure.in b/configure.in
index 3bc17e00..929f9f08 100644
--- a/configure.in
+++ b/configure.in
@@ -1154,6 +1154,7 @@ if test X"$OPT_MBEDTLS" != Xno; then
     AC_MSG_NOTICE([Detected mbedTLS. Enabling https inspection.])
 
     LIBS="-lmbedtls -lmbedx509 -lmbedcrypto $LIBS"
+    old_CFLAGS_nospecial="-Imbedtls/include $old_CFLAGS_nospecial"
 
     FEATURE_HTTPS_INSPECTION_ONLY=
   fi