X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=e8ba3f61cd5daaca5115773d9e633657a4b982aa;hb=80580ff609b4e30a66b56b2e9f0c5bdaf2c35754;hp=34ee7bbe7c2b1f7e05deabe0592282fcd1ae412a;hpb=9b591a03f71042c8b00f9ba55c303d738a0c2363;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 34ee7bbe7..e8ba3f61c 100644
--- 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.5.0
 
 
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
@@ -965,36 +965,22 @@ 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])
 
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
@@ -1206,7 +1192,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