[GNUnet-SVN] [libmicrohttpd] branch master updated: configure.ac: try to used gcrypt search path to find GnuTLS as last resort.

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new b61517ad configure.ac: try to used gcrypt search path to find GnuTLS 
as last resort.
b61517ad is described below

commit b61517ad9b147b78b09e69589c85a870b466decd
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Tue Feb 28 21:01:15 2017 +0300

    configure.ac: try to used gcrypt search path to find GnuTLS as last resort.
---
 configure.ac | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/configure.ac b/configure.ac
index 5fbfb83b..1340a212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1209,6 +1209,16 @@ AS_IF([test "x$with_gnutls" != "xno" && test 
"x$have_gnutls" != "xyes"],
       ],
       [
        have_gnutls_pkgcfg='no'
+       SAVE_CPPFLAGS="$CPPFLAGS"
+       SAVE_CFLAGS="$CFLAGS"
+       SAVE_LDFLAGS="$LDFLAGS"
+       SAVE_LIBS="$LIBS"
+       # Try to use libgcrypt search path
+       # as libgcrypt flags will be used
+       # anyway for HTTPs builds
+       CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
+       CPPFLAGS="$CPPFLAGS $LIBGCRYPT_CFLAGS"
+       LDFLAGS="$LDFLAGS $LIBGCRYPT_LIBS"
        AC_CHECK_HEADERS([gnutls/gnutls.h],
         [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
           [
@@ -1216,6 +1226,10 @@ AS_IF([test "x$with_gnutls" != "xno" && test 
"x$have_gnutls" != "xyes"],
             AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], 
[gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
             have_gnutls=yes
           ])], [], [AC_INCLUDES_DEFAULT])
+       CPPFLAGS="$SAVE_CPPFLAGS"
+       CFLAGS="$SAVE_CFLAGS"
+       LDFLAGS="$SAVE_LDFLAGS"
+       LIBS="$SAVE_LIBS"
       ])
   ])
 

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