api communication done

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 80ad72c61fa1c9bfec51d83609eb1f09b2e08dbe..92130c6e42b5f1c07416d01c0ba2cc81654a7ff2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -402,14 +402,14 @@ else
 fi
 
 
-# libcurl
-LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
-if test "$curl" = 1
+# libgnurl
+LIBGNURL_CHECK_CONFIG(,7.33.0,gnurl=1,gnurl=0)
+if test "$gnurl" = 1
 then
-       AM_CONDITIONAL(HAVE_LIBCURL, true)
-       AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])
+       AM_CONDITIONAL(HAVE_LIBGNURL, true)
+       AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
 else
-       AM_CONDITIONAL(HAVE_LIBCURL, false)
+       AM_CONDITIONAL(HAVE_LIBGNURL, false)
 fi
 
 
@@ -1032,7 +1032,14 @@ AC_ARG_WITH(gnutls,
         AC_CHECK_LIB([gnutls], [gnutls_priority_set],
           gnutls=true))])
 AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
-AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls])
+AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS])
+
+gnutls_dane=0
+AC_CHECK_HEADERS([gnutls/dane.h],
+   AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+            gnutls_dane=true))
+AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = xtrue)
+AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support])
 
 
 # Test if we are building for superMUC
@@ -1357,6 +1364,8 @@ src/mesh/mesh.conf
 src/multicast/Makefile
 src/multicast/multicast.conf
 src/mysql/Makefile
+src/namecache/Makefile
+src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
 src/nat/Makefile
@@ -1453,10 +1462,10 @@ then
   AC_MSG_NOTICE([NOTICE: sqlite not found.  sqLite support will not be compiled.])
 fi
 
-# libcurl
-if test "x$curl" = "x0"
+# libgnurl
+if test "x$gnurl" = "x0"
 then
-  AC_MSG_NOTICE([NOTICE: libcurl not found.  http client support will not be compiled.])
+  AC_MSG_NOTICE([NOTICE: libgnurl not found.  http client support will not be compiled.])
 fi
 
 # bluetooth
@@ -1468,7 +1477,12 @@ fi
 #gnutls
 if test x$gnutls != xtrue
 then
-  AC_MSG_NOTICE([NOTICE: gnutls not found, gnunet-gns-proxy will not be built])
+  AC_MSG_NOTICE([NOTICE: GnuTLS not found, gnunet-gns-proxy will not be built])
+else
+if test x$gnutls_dane != xtrue
+then
+  AC_MSG_NOTICE([NOTICE: GnuTLS has no DANE support, DANE validation will not be possible])
+fi
 fi
 
 # java ports