diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-08-08 14:42:29 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-08-09 12:06:28 +0200 |
| commit | 3668d9d76232678007efe25f5a761d80b37a0f3e (patch) | |
| tree | 29c6111509df7a359179545493e6e12b8a834f82 | |
| parent | ebdb0d5c235970a34b3630a914df7f9a05fcd564 (diff) | |
| download | curl-3668d9d76232678007efe25f5a761d80b37a0f3e.tar.gz | |
configure: fix for -lpthread detection with OpenSSL and pkg-config
... by making sure it uses the -I provided by pkg-config!
Reported-by: pszemus on github
Fixes #2848
Closes #2850
| -rwxr-xr-x | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 22280a5e9..18b7ae0f1 100755 --- a/configure.ac +++ b/configure.ac @@ -1650,7 +1650,10 @@ if test -z "$ssl_backends" -o "x$OPT_SSL" != xno && LIBS="-lcrypto $LIBS" ],[ LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL" - CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" + if test "$PKGCONFIG" = "no" ; then + # only set this if pkg-config wasn't used + CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" + fi AC_CHECK_LIB(crypto, HMAC_Init_ex,[ HAVECRYPTO="yes" LIBS="-lcrypto $LIBS"], [ |