# 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)
[libidn=yes LIBS="${LIBS} -lidn"], libidn=no),
libidn=no)
fi
-if test "$libidn" != "no" ; then
- AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.])
- else
- AC_MSG_FAILURE([Libidn not found])
-fi
+AM_CONDITIONAL([HAVE_LIBIDN], [test "$libidn" != "no"])
AC_MSG_RESULT($libidn)
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
AC_SUBST(POSTGRES_CPPFLAGS)
AC_SUBST(POSTGRES_LDFLAGS)
-# test for libz (maybe required for linking mysql)
-zlib=1
-AC_CHECK_LIB(z, compress,,zlib=0)
-AM_CONDITIONAL(HAVE_ZLIB, test x$zlib = x1)
-if test "$zlib" != 1
-then
- AC_MSG_ERROR([GNUnet requires zlib])
-fi
+# test for zlib
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
+AC_ARG_WITH(zlib,
+ [ --with-zlib[[=DIR]] use libz in DIR],
+ [AS_IF([test "$withval" = "no"],
+ [AC_MSG_ERROR([GNUnet requires zlib])],
+ [test "$withval" != "yes"],
+ [
+ Z_DIR=$withval
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ ])
+ ])
+AC_CHECK_HEADER(zlib.h,
+ [],
+ [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_CHECK_LIB(z, compress2,
+ [
+ AC_DEFINE([HAVE_ZLIB], [], [Have compression library])
+ if test "x${Z_DIR}" != "x"; then
+ Z_CFLAGS="-I${Z_DIR}/include"
+ Z_LIBS="-L${Z_DIR}/lib -lz"
+ else
+ Z_LIBS="-lz"
+ fi],
+ [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_SUBST(Z_CFLAGS)
+AC_SUBST(Z_LIBS)
+
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
# mysql & windows
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
[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],
src/ats/ats.conf
src/ats-tool/Makefile
src/block/Makefile
-src/chat/Makefile
-src/chat/chat.conf
src/core/Makefile
src/core/core.conf
src/consensus/Makefile
src/dv/Makefile
src/dv/dv.conf
src/exit/Makefile
+src/experimentation/Makefile
+src/experimentation/experimentation.conf
src/fragmentation/Makefile
src/fs/Makefile
src/fs/fs.conf
src/postgres/Makefile
src/pt/Makefile
src/regex/Makefile
+src/regex/regex.conf
+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