libmicrohttpd

commit 9459be1e04db675324cc1098885357bba2927555
parent 54cd6ac43708793ee7e03a2ac1038fd86e045030
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Fri, 24 Nov 2017 12:40:15 +0300

configure: minor fixing GnuTLS detection in special cases

Diffstat:
M
configure.ac
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git 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([