- proper memory usage

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index db0b7fa12f2b9e0b6c7c7b72fc3b8c09099f5e8e..1a760b64f19bdff4a047dadf547ec4c0d2a1cd45 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
@@ -970,17 +955,39 @@ AC_ARG_ENABLE([ll],
     [AS_HELP_STRING([--enable-ll],
        [build GNUnet testbed for use with IBM LoadLeveler for running testbed on
               SuperMUC (default is NO)])],
-    [if `test "x$enable_ll" = "xno"`
+    [if test "x$enable_ll" = "xno"
      then
-       ll=false
+       ll=0
      else
-       ll=true
+       ll=1
      fi],
-    [ll=false])
+    [ll=0
+     enable_ll=no])
 AC_MSG_RESULT($enable_ll)
-AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "xtrue"])
+AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
 AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
 
+# Check if NSE has to send timestamp information to testbed logger for
+# generating histogram of messages received
+AC_MSG_CHECKING(if NSE has to send timestamp information to testbed logger)
+AC_ARG_ENABLE([nse-histogram],
+    [AS_HELP_STRING([--enable-nse-histogram],
+       [have NSE send timestamp information to testbed logger for generating
+       histogram of received messages.  NOT useful for production (default is
+       NO)])],
+    [if test "x$enableval" = "xno"
+     then
+       nse_histogram=0
+     else
+       nse_histogram=1
+     fi],
+    [nse_histogram=0
+     enable_nse_histogram=no])
+AC_MSG_RESULT($enable_nse_histogram)
+AM_CONDITIONAL([ENABLE_NSE_HISTOGRAM], [test "x$nse_histogram" = "x1"])
+AC_DEFINE_UNQUOTED([ENABLE_NSE_HISTOGRAM], [$nse_histogram],
+                   [have NSE send timestamp information to testbed logger])
+
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -1258,11 +1265,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