summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-03-07 10:58:50 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-03-07 10:58:50 +0000
commitb40d8947f8d40a611b4f5224b935f3fd4a3aa848 (patch)
treedafa4d629f7a95d1c479839565b154c81215ce14 /configure.ac
parent04362fdc4f2829da73b5829e49f262e6401a9b9c (diff)
- remove unused code
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac55
1 files changed, 14 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac
index 738e204ac..db0b7fa12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -965,48 +965,21 @@ 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"])
-if test "x$llapi" = "xtrue"
-then
- AC_DEFINE_UNQUOTED([WITH_LL], [$llapi], [Do we have to use IBM LoadLeveler])
- AC_CHECK_HEADERS([pwd.h],
- AC_CHECK_LIB([c],[getpwuid],,
- AC_MSG_ERROR(getpwid function not available in libc but is required)),
- AC_MSG_ERROR(pwd.h not found but is required),
- [[
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- ]])
-fi
+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=false
+ else
+ ll=true
+ fi],
+ [ll=false])
+AC_MSG_RESULT($enable_ll)
+AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "xtrue"])
+AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
# should 'make check' run tests?
AC_MSG_CHECKING(whether to run tests)