[GNUnet-SVN] [gnurl] 64/153: configure: fix for -lpthread detection with OpenSSL and pkg-config

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 3668d9d76232678007efe25f5a761d80b37a0f3e
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Aug 8 14:42:29 2018 +0200

    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
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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"], [

-- 
To stop receiving notification emails like this one, please contact
address@hidden