- Remove old tree lib

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fbe2fee8f1c527edab556ff331841b2b62eba10b..1a760b64f19bdff4a047dadf547ec4c0d2a1cd45 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2012 Christian Grothoff (and other contributing authors)
+# (C) 2001--2013 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -22,13 +22,13 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.9.5],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.5a],[bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([gnunet], [0.9.5])
+AM_INIT_AUTOMAKE([gnunet], [0.9.5a])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -222,7 +222,7 @@ fi
 # libgcrypt
 gcrypt=0
 NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.4.2
+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
@@ -794,7 +779,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -965,36 +950,43 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls])
 
 
 # Test if we are building for superMUC
-llapi=0
 AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC)
-AC_ARG_WITH([ll],
-    [AS_HELP_STRING([--with-ll=PFX],
-       [use IBM LoadLeveler (installed at PFX) for running testbed on SuperMUC]. Default is no)],
-    [AC_MSG_RESULT([$with_ll])
-     case $with_ll in
-       no)
-         ;;
-       yes)
-         AC_CHECK_HEADERS([llapi.h],
-           AC_CHECK_LIB([llapi], [llsubmit],
-               llapi=true,
-               AC_MSG_ERROR(libllapi not found but --with-llapi given)),
-           AC_MSG_ERROR(llapi.h not found but --with-llapi given))
-       ;;
-       *)
-         LDFLAGS="-L$with_ll/lib $LDFLAGS"
-         CPPFLAGS="-I$with_ll/include $CPPFLAGS"
-        AC_CHECK_HEADERS([llapi.h],
-           AC_CHECK_LIB([llapi], [llsubmit],
-               llapi=true,
-               AC_MSG_ERROR(libllapi not found but --with-llapi given)),
-           AC_MSG_ERROR(llapi.h not found but --with-llapi given))
-        ;;
-     esac
-    ],
-    [AC_MSG_RESULT(--with-ll not specified)])
-AM_CONDITIONAL([WITH_LL], [test "x$llapi" = "xtrue"])
-AC_DEFINE_UNQUOTED(WITH_LL, $llapi, [Do we have to use IBM LoadLeveler])
+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"
+     then
+       ll=0
+     else
+       ll=1
+     fi],
+    [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])
+
+# 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)
@@ -1206,7 +1198,7 @@ then
     AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
   else
     gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/')
-    if "X$gitver" = "X"
+    if test "X$gitver" = "X"
     then
       AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
     else
@@ -1273,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