# 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
#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.9.4],[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.4])
+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])
# libgcrypt
gcrypt=0
NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.4.2
+NEED_LIBGCRYPT_VERSION=1.5.0
AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
fi
+# test for glib
+# Minimum required version for glibtop is 2.6.0
+AM_PATH_GLIB_2_0(2.6.0, [glib2=true] , [glib2=false] ,)
+if test x$glib2 = xfalse
+then
+ AM_CONDITIONAL(HAVE_GLIB2, false)
+ AC_MSG_WARN([GNUnet requires GLIB >= 2.6.0])
+else
+ AM_CONDITIONAL(HAVE_GLIB2, true)
+ AC_DEFINE([HAVE_GLIB2],[1],[Have glib2])
+ LIBS="$LIBS $GLIB_LIBS"
+ 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])
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
# 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])
+AC_MSG_RESULT($enable_ll)
+AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
+AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
# should 'make check' run tests?
AC_MSG_CHECKING(whether to run tests)
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
src/testbed/Makefile
src/testbed/testbed.conf
src/testing/Makefile
-src/testing_old/Makefile
src/topology/Makefile
src/transport/Makefile
src/transport/transport.conf