doxygen

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6d779031389b59244a32eeb0ca5e8ae3329c608e..3f6f152fd86831f36755ad1908f068b0425ab71d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -936,6 +936,37 @@ AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
 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])
 
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
@@ -1137,6 +1168,27 @@ AC_MSG_RESULT($use_gcov)
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 
+# version info
+AC_PATH_PROG(svnversioncommand, svnversion)
+AC_PATH_PROG(gitcommand, git)
+if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported"
+then
+  if test "X$gitcommand" = "X"
+  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"
+    then
+      AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
+    else
+      AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version])
+    fi
+  fi
+else
+  AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version])
+fi
+
 AC_CONFIG_FILES([ 
 Makefile
 contrib/Makefile
@@ -1196,6 +1248,8 @@ src/regex/Makefile
 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