-fix testcase, reintroduce timeout

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c5af70f1590a603661b6112b62cd2f30e76915f3..a558ffd1e264c60b9d4c4b9b5092e4a0bccc484b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -320,29 +320,21 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-AC_ARG_ENABLE([ats],
-  [AS_HELP_STRING([--enable-ats], [enable ATS code])],
-  [enable_ats=${enableval}],
-  [enable_ats=no])
-if test x${enable_ats} = xyes
+
+AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
+AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
+# GLPK must support atm MLP presolving, version >= 4.32
+AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
+if test x$gplk = xfalse
 then
-       AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
-       AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
-       # GLPK must support atm MLP presolving, version >= 4.32
-       AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
-       if test x$gplk = xfalse
-       then
-               AM_CONDITIONAL(HAVE_LIBGLPK, false)
-               AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
-       else
-               AM_CONDITIONAL(HAVE_LIBGLPK, true)
-               AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
-       fi
-else
        AM_CONDITIONAL(HAVE_LIBGLPK, false)
-       AC_MSG_RESULT([no])
+       AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
+else
+       AM_CONDITIONAL(HAVE_LIBGLPK, true)
+       AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
+
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -872,6 +864,7 @@ src/fragmentation/Makefile
 src/fs/Makefile
 src/fs/fs.conf
 src/gns/Makefile
+src/gns/gns.conf
 src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h