summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-12-20 00:53:08 +0000
committerChristian Grothoff <christian@grothoff.org>2014-12-20 00:53:08 +0000
commit96be70d5f2d5e4e0fe43d60b4addcfdf6e7b18e9 (patch)
tree53c970a28025db497e1d53e7c1178a51a0bf109c /configure.ac
parent5e8b5c6ccbe2411d509aa4aeb501cf179d6e1ca7 (diff)
-do not warn about libcurl if we have libgnurl
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4391b20a7..8374c5c7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,7 +476,10 @@ fi
if test x$curl = xfalse
then
AM_CONDITIONAL(HAVE_LIBCURL, false)
+if test "$gnurl" = 0
+then
AC_MSG_WARN([GNUnet requires libcurl-gnutls >= 7.34])
+fi
else
AM_CONDITIONAL(HAVE_LIBCURL, true)
AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])
@@ -1084,7 +1087,6 @@ AC_ARG_WITH(gnutls,
])
AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS])
-d
AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support])