- ignore kdevelop project/metadata files

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 228ff17e024f509657eaa71ac715785046a3d49c..02271fdad5fd07ec2415fcbbd97d2e328c18a342 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -326,7 +326,7 @@ AC_LANG_POP(C)
 fi     # $build = $target
 
 # libcurl
-LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
+LIBCURL_CHECK_CONFIG(,7.21.3,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.21.3]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -647,23 +647,6 @@ LIBS=$SAVE_LIBS
 AM_PATH_PYTHON([2.6],, [:])
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
-if test "$PYTHON" != :
-then
-  AC_MSG_CHECKING([for pexpect])
-  $PYTHON -c "import pexpect" > /dev/null 2> /dev/null
-  PYEX=$?
-  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
-  if test $PYEX -eq 0
-  then
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([not found])
-  fi
-else
-  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0)
-fi
-
-
 # check for gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])
@@ -808,6 +791,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],
@@ -1057,7 +1074,9 @@ src/statistics/statistics.conf
 src/stream/Makefile
 src/template/Makefile
 src/testbed/Makefile
+src/testbed/testbed.conf
 src/testing/Makefile
+src/testing_old/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf
@@ -1104,6 +1123,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
@@ -1127,6 +1152,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