Skip to content

Commit

Permalink
curl-openssl.m4: do not add $prefix/include/openssl to CPPFLAGS
Browse files Browse the repository at this point in the history
As OpenSSL's include files are all included using <openssl/*.h> in curl
source code, we just risk that existing openssl files will "shadow"
include files without path if that path is provided.

Fixes curl#9989
Closes curl#9988
  • Loading branch information
bagder committed Nov 28, 2022
1 parent 4506cbf commit 42aa4e1
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions m4/curl-openssl.m4
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ if test "x$OPT_OPENSSL" != xno; then
SSL_LDFLAGS="-L$LIB_OPENSSL"
SSL_CPPFLAGS="-I$PREFIX_OPENSSL/include"
fi
SSL_CPPFLAGS="$SSL_CPPFLAGS -I$PREFIX_OPENSSL/include/openssl"
;;
esac
Expand Down Expand Up @@ -150,7 +149,7 @@ if test "x$OPT_OPENSSL" != xno; then
fi
if test "$PKGCONFIG" = "no" -a -n "$PREFIX_OPENSSL" ; then
# only set this if pkg-config wasn't used
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include"
fi
# Linking previously failed, try extra paths from --with-openssl or
# pkg-config. Use a different function name to avoid reusing the earlier
Expand Down

0 comments on commit 42aa4e1

Please sign in to comment.