projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bb097e9
)
Don't add '-Imbedtls/include' to the CFLAGS when not building with mbedTLS
author
Fabian Keil
<fk@fabiankeil.de>
Thu, 11 Jun 2020 18:11:28 +0000
(20:11 +0200)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 15 Jun 2020 08:43:22 +0000
(10:43 +0200)
Sponsored by: Robert Klemme
GNUmakefile.in
patch
|
blob
|
history
configure.in
patch
|
blob
|
history
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
92ef0a1
..
40b5706
100644
(file)
--- 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
3bc17e0
..
929f9f0
100644
(file)
--- 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