[GNUnet-SVN] [libmicrohttpd] branch master updated: configure: minor fixing GnuTLS detection in special cases

[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 9459be1e configure: minor fixing GnuTLS detection in special cases
9459be1e is described below

commit 9459be1e04db675324cc1098885357bba2927555
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Fri Nov 24 12:40:15 2017 +0300

    configure: minor fixing GnuTLS detection in special cases
---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 873af025..fee368be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1540,9 +1540,7 @@ choke me now
        SAVE_CFLAGS="$CFLAGS"
        SAVE_LDFLAGS="$LDFLAGS"
        SAVE_LIBS="$LIBS"
-       CPPFLAGS="$GNUTLS_CFLAGS $CPPFLAGS"
        CFLAGS="$GNUTLS_CFLAGS $CFLAGS"
-       LDFLAGS="$GNUTLS_LIBS $LDFLAGS"
        LIBS="$LIBS $GNUTLS_LIBS"
        AC_MSG_CHECKING([[whether GnuTLS is usable]])
        AC_LINK_IFELSE([
@@ -1557,7 +1555,9 @@ choke me now
           [
            AC_MSG_RESULT([[yes]])
            have_gnutls=yes
+           # GNUTLS_CFLAGS is actually CPPFLAGS
            GNUTLS_CPPFLAGS="$GNUTLS_CFLAGS"
+           # GNUTLS_CFLAGS is combination of LDFLAGS and LIBS
            GNUTLS_LDFLAGS="$GNUTLS_LIBS"
           ],
           [
@@ -1639,9 +1639,9 @@ AS_IF([test "x$have_gnutls" != "xyes" && test 
"x$with_gnutls" = "xyes"], [AC_MSG
      SAVE_CFLAGS="$CFLAGS"
      SAVE_LDFLAGS="$LDFLAGS"
      SAVE_LIBS="$LIBS"
-     CPPFLAGS="$GNUTLS_CFLAGS $CPPFLAGS"
+     CPPFLAGS="$GNUTLS_CPPFLAGS $CPPFLAGS"
      CFLAGS="$GNUTLS_CFLAGS $CFLAGS"
-     LDFLAGS="$GNUTLS_LIBS $LDFLAGS"
+     LDFLAGS="$GNUTLS_LDFLAGS $LDFLAGS"
      LIBS="$LIBS $GNUTLS_LIBS"
      AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]])
      AC_LINK_IFELSE([

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