diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-21 23:35:40 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-22 14:39:52 +0300 |
commit | d30195fc18db741fc59cd3ca00b6de7c3c4296e4 (patch) | |
tree | 8c84b9e18582d55a0b32b6e0b58d8a7e5bd753f9 | |
parent | 11e15b46f05352932e2682d7664648f717aa979a (diff) | |
download | libmicrohttpd-d30195fc18db741fc59cd3ca00b6de7c3c4296e4.tar.gz libmicrohttpd-d30195fc18db741fc59cd3ca00b6de7c3c4296e4.zip |
configure: fixed additional checks for GnuTLS
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 143ad648..ca336ab7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1570,7 +1570,8 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1570 | # A bit of hack: unset cache variable to force recheck | 1570 | # A bit of hack: unset cache variable to force recheck |
1571 | AS_UNSET([ac_cv_header_gnutls_gnutls_h]) | 1571 | AS_UNSET([ac_cv_header_gnutls_gnutls_h]) |
1572 | AC_CHECK_HEADERS([gnutls/gnutls.h], | 1572 | AC_CHECK_HEADERS([gnutls/gnutls.h], |
1573 | [AC_CHECK_LIB([gnutls], [gnutls_priority_set], | 1573 | [AS_UNSET([ac_cv_lib_gnutls_gnutls_priority_set]) # A bit of hack: unset cache variable to force recheck |
1574 | AC_CHECK_LIB([gnutls], [gnutls_priority_set], | ||
1574 | [ | 1575 | [ |
1575 | GNUTLS_CPPFLAGS="$LIBGCRYPT_CFLAGS" | 1576 | GNUTLS_CPPFLAGS="$LIBGCRYPT_CFLAGS" |
1576 | GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS" | 1577 | GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS" |
@@ -1654,7 +1655,6 @@ choke me now | |||
1654 | # LIBGCRYPT_CFLAGS can be actually a CPPFLAGS, so check them both | 1655 | # LIBGCRYPT_CFLAGS can be actually a CPPFLAGS, so check them both |
1655 | CPPFLAGS="$CPPFLAGS $LIBGCRYPT_CFLAGS" | 1656 | CPPFLAGS="$CPPFLAGS $LIBGCRYPT_CFLAGS" |
1656 | AC_CHECK_HEADERS([gcrypt.h], [], [have_gcrypt=no], [AC_INCLUDES_DEFAULT]) | 1657 | AC_CHECK_HEADERS([gcrypt.h], [], [have_gcrypt=no], [AC_INCLUDES_DEFAULT]) |
1657 | # Check for GnuTLS with gcrypt flags | ||
1658 | CPPFLAGS="$SAVE_CPPFLAGS" | 1658 | CPPFLAGS="$SAVE_CPPFLAGS" |
1659 | CFLAGS="$SAVE_CFLAGS" | 1659 | CFLAGS="$SAVE_CFLAGS" |
1660 | ] | 1660 | ] |