- remove regex from mesh

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 35d83103270a1f1b85914ced2434ba76dd1bb98f..8a6fb3a7d5821172833f7f6007f24303d5a82ea7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ fi
 # libgcrypt
 gcrypt=0
 NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.5.0
+NEED_LIBGCRYPT_VERSION=1.6.0
 
 
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
@@ -401,7 +401,8 @@ LIBS=$SAVE_LIBS
 
 
 AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
-AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
+# GLPK must support glpk_init_env, version >= 4.43
+AC_CHECK_LIB([glpk],[glp_init_env],,[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
@@ -427,22 +428,6 @@ else
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
 fi
 
-#libgtop
-PKG_CHECK_MODULES(LIBGTOP,libgtop-2.0,  [gtop=true] , [gtop=false] )
-if test x$gtop = xfalse
-then
-       AM_CONDITIONAL(HAVE_LIBGTOP, false)
-       AC_MSG_WARN([GNUnet requires libgtop])
-else
-       AM_CONDITIONAL(HAVE_LIBGTOP, true)
-       AC_DEFINE([HAVE_LIBGTOP],[1],[Have libgtop])
-       LIBS="$LIBS $LIBGTOP_LIBS"
-       CFLAGS="$CFLAGS $LIBGTOP_CFLAGS"
-fi
-
-
-
-
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
 if test x$nss = xfalse
 then
@@ -976,7 +961,8 @@ AC_ARG_ENABLE([ll],
      else
        ll=1
      fi],
-    [ll=0])
+    [ll=0
+     enable_ll=no])
 AC_MSG_RESULT($enable_ll)
 AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
 AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
@@ -1258,11 +1244,11 @@ src/peerinfo-tool/Makefile
 src/postgres/Makefile
 src/pt/Makefile
 src/regex/Makefile
+src/set/Makefile
+src/set/set.conf
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/stream/Makefile
-src/sysmon/Makefile
-src/sysmon/sysmon.conf
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf