[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 03/03: configure: make sure that TLS flags
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 03/03: configure: make sure that TLS flags are not passed to makefiles if TLS is not used |
Date: |
Wed, 22 Nov 2017 21:54:16 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 8fce1b9bc794d0151eed70ed67b242b85d0fccd7
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Wed Nov 22 21:55:00 2017 +0300
configure: make sure that TLS flags are not passed to makefiles if
TLS is not used
---
configure.ac | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 425c41ac..873af025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1711,6 +1711,12 @@ choke me now
AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS
support cannot be enabled without $crypt_missing.]])])
enable_https=no
MSG_HTTPS="no (lacking $crypt_missing)"
+ AS_UNSET([LIBGCRYPT_CFLAGS])
+ AS_UNSET([LIBGCRYPT_LIBS])
+ AS_UNSET([GNUTLS_CPPFLAGS])
+ AS_UNSET([GNUTLS_CFLAGS])
+ AS_UNSET([GNUTLS_LDFLAGS])
+ AS_UNSET([GNUTLS_LIBS])
],
[
AC_DEFINE([[HTTPS_SUPPORT]],[[1]],[Define to 1 if libmicrohttpd is
compiled with HTTPS support.])
@@ -1724,13 +1730,15 @@ choke me now
MHD_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS"
AC_DEFINE([[MHD_HTTPS_REQUIRE_GRYPT]], [[1]], [Define to `1' if
HTTPS require initialisation of libgcrypt])
],
- [[
+ [
MSG_HTTPS="yes (using libgnutls)"
+ AS_UNSET([LIBGCRYPT_CFLAGS])
+ AS_UNSET([LIBGCRYPT_LIBS])
MHD_LIB_CPPFLAGS="$MHD_LIB_CPPFLAGS $GNUTLS_CPPFLAGS"
MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $GNUTLS_CFLAGS"
MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS $GNUTLS_LDFLAGS"
MHD_LIBDEPS="$GNUTLS_LIBS $MHD_LIBDEPS"
- ]]
+ ]
)
AS_IF([[ test "x$have_gnutls_pkgcfg" = "xyes" ]],
[ # remove GnuTLS from private libs in .pc file as it defined in
Requires.private
@@ -1754,6 +1762,12 @@ choke me now
AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS support
cannot be enabled without $crypt_missing.]])])
enable_https=no
MSG_HTTPS="no (lacking $crypt_missing)"
+ AS_UNSET([LIBGCRYPT_CFLAGS])
+ AS_UNSET([LIBGCRYPT_LIBS])
+ AS_UNSET([GNUTLS_CPPFLAGS])
+ AS_UNSET([GNUTLS_CFLAGS])
+ AS_UNSET([GNUTLS_LDFLAGS])
+ AS_UNSET([GNUTLS_LIBS])
]
)
else
--
To stop receiving notification emails like this one, please contact
address@hidden