# 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)
# 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])
# 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