- remove unused code

6 files changed, 20 insertions, 47 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)
diff --git a/contrib/testbed_infiniband.conf b/contrib/testbed_infiniband.conf
index 1c166d1f4..a0566b371 100644
--- a/contrib/testbed_infiniband.conf
+++ b/contrib/testbed_infiniband.conf
@@ -1,7 +1,7 @@
 [testbed]
 AUTOSTART = NO
 PORT = 12113
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
 HOSTNAME = localhost
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
 OVERLAY_TOPOLOGY = RANDOM
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 27970cdf0..bd7eca3ae 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -9,7 +9,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-if WITH_LL
+if ENABLE_LL
   ll_binaries = \
     gnunet-testbed-mpi-spawn
 endif
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 5cca55b4b..686679e98 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -229,7 +229,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   char *hostfile;
 
   hostfile = NULL;
-#ifndef WITH_LL
+#if !ENABLE_LL
   if (NULL == args[0])
   {
     fprintf (stderr, _("No hosts-file specified on command line\n"));
@@ -271,7 +271,7 @@ main (int argc, char *const *argv)
      GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails},
     GNUNET_GETOPT_OPTION_END
   };
-#ifdef WITH_LL
+#if ENABLE_LL
   const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]";
 #else
   const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS] hosts-file";
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 6cac5eeb6..f1f9003ee 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -588,7 +588,7 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (const struct
                                             GNUNET_CONFIGURATION_Handle *cfg,
                                             struct GNUNET_TESTBED_Host ***hosts)
 {
-#ifndef WITH_LL
+#if !ENABLE_LL
   LOG (GNUNET_ERROR_TYPE_ERROR, 
        _("The function %s is only available when compiled with (--with-ll)\n"),
        __func__);
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 1297bfc23..282e4af88 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -1050,7 +1050,7 @@ GNUNET_TESTBED_run (const char *host_filename,
   GNUNET_assert (num_peers > 0);
   rc = GNUNET_malloc (sizeof (struct RunContext));
   rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
-#ifdef WITH_LL
+#if ENABLE_LL
   rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg,
                                                               &rc->hosts);
   if (0 == rc->num_hosts)