diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-22 21:55:00 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-22 23:53:26 +0300 |
commit | 8fce1b9bc794d0151eed70ed67b242b85d0fccd7 (patch) | |
tree | 4ed4901c9e89ee243538c1f0515c7c628e6f4a27 /configure.ac | |
parent | b670a4926ebea2ef1b9592961059de5a1f36b3e3 (diff) | |
download | libmicrohttpd-8fce1b9bc794d0151eed70ed67b242b85d0fccd7.tar.gz libmicrohttpd-8fce1b9bc794d0151eed70ed67b242b85d0fccd7.zip |
configure: make sure that TLS flags are not passed to makefiles if
TLS is not used
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 18 |
1 files 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 | |||
1711 | AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS support cannot be enabled without $crypt_missing.]])]) | 1711 | AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS support cannot be enabled without $crypt_missing.]])]) |
1712 | enable_https=no | 1712 | enable_https=no |
1713 | MSG_HTTPS="no (lacking $crypt_missing)" | 1713 | MSG_HTTPS="no (lacking $crypt_missing)" |
1714 | AS_UNSET([LIBGCRYPT_CFLAGS]) | ||
1715 | AS_UNSET([LIBGCRYPT_LIBS]) | ||
1716 | AS_UNSET([GNUTLS_CPPFLAGS]) | ||
1717 | AS_UNSET([GNUTLS_CFLAGS]) | ||
1718 | AS_UNSET([GNUTLS_LDFLAGS]) | ||
1719 | AS_UNSET([GNUTLS_LIBS]) | ||
1714 | ], | 1720 | ], |
1715 | [ | 1721 | [ |
1716 | AC_DEFINE([[HTTPS_SUPPORT]],[[1]],[Define to 1 if libmicrohttpd is compiled with HTTPS support.]) | 1722 | AC_DEFINE([[HTTPS_SUPPORT]],[[1]],[Define to 1 if libmicrohttpd is compiled with HTTPS support.]) |
@@ -1724,13 +1730,15 @@ choke me now | |||
1724 | MHD_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS" | 1730 | MHD_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS" |
1725 | AC_DEFINE([[MHD_HTTPS_REQUIRE_GRYPT]], [[1]], [Define to `1' if HTTPS require initialisation of libgcrypt]) | 1731 | AC_DEFINE([[MHD_HTTPS_REQUIRE_GRYPT]], [[1]], [Define to `1' if HTTPS require initialisation of libgcrypt]) |
1726 | ], | 1732 | ], |
1727 | [[ | 1733 | [ |
1728 | MSG_HTTPS="yes (using libgnutls)" | 1734 | MSG_HTTPS="yes (using libgnutls)" |
1735 | AS_UNSET([LIBGCRYPT_CFLAGS]) | ||
1736 | AS_UNSET([LIBGCRYPT_LIBS]) | ||
1729 | MHD_LIB_CPPFLAGS="$MHD_LIB_CPPFLAGS $GNUTLS_CPPFLAGS" | 1737 | MHD_LIB_CPPFLAGS="$MHD_LIB_CPPFLAGS $GNUTLS_CPPFLAGS" |
1730 | MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $GNUTLS_CFLAGS" | 1738 | MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $GNUTLS_CFLAGS" |
1731 | MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS $GNUTLS_LDFLAGS" | 1739 | MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS $GNUTLS_LDFLAGS" |
1732 | MHD_LIBDEPS="$GNUTLS_LIBS $MHD_LIBDEPS" | 1740 | MHD_LIBDEPS="$GNUTLS_LIBS $MHD_LIBDEPS" |
1733 | ]] | 1741 | ] |
1734 | ) | 1742 | ) |
1735 | AS_IF([[ test "x$have_gnutls_pkgcfg" = "xyes" ]], | 1743 | AS_IF([[ test "x$have_gnutls_pkgcfg" = "xyes" ]], |
1736 | [ # remove GnuTLS from private libs in .pc file as it defined in Requires.private | 1744 | [ # remove GnuTLS from private libs in .pc file as it defined in Requires.private |
@@ -1754,6 +1762,12 @@ choke me now | |||
1754 | AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS support cannot be enabled without $crypt_missing.]])]) | 1762 | AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS support cannot be enabled without $crypt_missing.]])]) |
1755 | enable_https=no | 1763 | enable_https=no |
1756 | MSG_HTTPS="no (lacking $crypt_missing)" | 1764 | MSG_HTTPS="no (lacking $crypt_missing)" |
1765 | AS_UNSET([LIBGCRYPT_CFLAGS]) | ||
1766 | AS_UNSET([LIBGCRYPT_LIBS]) | ||
1767 | AS_UNSET([GNUTLS_CPPFLAGS]) | ||
1768 | AS_UNSET([GNUTLS_CFLAGS]) | ||
1769 | AS_UNSET([GNUTLS_LDFLAGS]) | ||
1770 | AS_UNSET([GNUTLS_LIBS]) | ||
1757 | ] | 1771 | ] |
1758 | ) | 1772 | ) |
1759 | else | 1773 | else |