[GNUnet-SVN] r34723 - gnunet

[gnunet]

Author: grothoff
Date: 2014-12-20 01:53:08 +0100 (Sat, 20 Dec 2014)
New Revision: 34723

Modified:
   gnunet/configure.ac
Log:
-do not warn about libcurl if we have libgnurl

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2014-12-20 00:40:16 UTC (rev 34722)
+++ gnunet/configure.ac 2014-12-20 00:53:08 UTC (rev 34723)
@@ -476,7 +476,10 @@
 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 @@
    ])
 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])