3 files changed, 44 insertions, 0 deletions

diff --git a/README b/README
index 5fa01210a..78207584f 100644
--- a/README
+++ b/README
@@ -33,6 +33,7 @@ These are the direct dependencies for running GNUnet:
 - libgcrypt     >= 1.2
 - libcurl       >= 7.21.3
 - libunistring  >= 0.9.2
+- gnutls        >= 2.12.0
 - libltdl       >= 2.2 (part of GNU libtool)
 - sqlite        >= 3.0 (default database)
 - mysql         >= 5.1 (alternative to sqLite)
diff --git a/configure.ac b/configure.ac
index e711a12a9..de4817a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -808,6 +808,40 @@ AC_ARG_WITH(gnunetdns,
 AC_SUBST(GNUNETDNS_GROUP)
 
 
+
+# gnutls
+gnutls=0
+AC_MSG_CHECKING(for gnutls)
+AC_ARG_WITH(gnutls,
+   [  --with-gnutls=PFX   base of gnutls installation],
+   [AC_MSG_RESULT([$with_gnutls])
+    case $with_gnutls in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS([gnutls/abstract.h],
+            AC_CHECK_LIB([gnutls], [gnutls_priority_set],
+             gnutls=true))
+        ;;
+      *)
+        LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
+        CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
+        AC_CHECK_HEADERS([gnutls/abstract.h],
+            AC_CHECK_LIB([gnutls], [gnutls_priority_set],
+              EXT_LIB_PATH="-L$with_gnutls/lib $EXT_LIB_PATH"
+              gnutls=true))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-gnutls not specified])
+    AC_CHECK_HEADERS([gnutls/abstract.h],
+        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])
+
+
+
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -1105,6 +1139,12 @@ then
   AC_MSG_NOTICE([NOTICE: sqlite not found.  sqLite support will not be compiled.])
 fi
 
+#gnutls
+if test x$gnutls != xtrue
+then
+  AC_MSG_NOTICE([NOTICE: gnutls not found, gnunet-gns-proxy will not be built])
+fi
+
 # java ports
 if test "x$enable_java_ports" = "xyes"
 then
@@ -1128,6 +1168,7 @@ then
   AC_MSG_NOTICE([NOTICE: --with-sudo not specified and not running as 'root', will not install GNS NSS library])
 fi
 
+
 AC_MSG_NOTICE([********************************************
 You can compile GNUnet with
         make
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 14aaeee09..93eed3ae9 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -26,8 +26,10 @@ lib_LTLIBRARIES = \
 
 if HAVE_MHD
  DO_FCFSD=gnunet-gns-fcfsd
+if HAVE_GNUTLS
  DO_PROXY=gnunet-gns-proxy
 endif
+endif
 
 bin_PROGRAMS = \
   gnunet-service-gns \