# 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)
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
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
# 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"])
-if test "x$llapi" = "xtrue"
-then
- AC_DEFINE_UNQUOTED([WITH_LL], [$llapi], [Do we have to use IBM LoadLeveler])
- AC_CHECK_HEADERS([pwd.h],
- AC_CHECK_LIB([c],[getpwuid],,
- AC_MSG_ERROR(getpwid function not available in libc but is required)),
- AC_MSG_ERROR(pwd.h not found but is required),
- [[
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- ]])
-fi
+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)
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