collision detection for IBF, timing for test tool

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c70c2229278c387ebe0a76ecb346637c2263e137..369941f029c98e22e10b73d3f5b172a20cc40834 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -413,6 +413,34 @@ else
        AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
+# test for glib
+# Minimum required version for glibtop is 2.6.0
+AM_PATH_GLIB_2_0(2.6.0, [glib2=true] , [glib2=false] ,)
+if test x$glib2 = xfalse
+then
+       AM_CONDITIONAL(HAVE_GLIB2, false)
+       AC_MSG_WARN([GNUnet requires GLIB >= 2.6.0])
+else
+       AM_CONDITIONAL(HAVE_GLIB2, true)
+       AC_DEFINE([HAVE_GLIB2],[1],[Have glib2])
+       LIBS="$LIBS $GLIB_LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+fi
+
+#libgtop
+PKG_CHECK_MODULES(LIBGTOP,libgtop-2.0,  [gtop=true] , [gtop=false] )
+if test x$gtop = xfalse
+then
+       AM_CONDITIONAL(HAVE_LIBGTOP, false)
+       AC_MSG_WARN([GNUnet requires libgtop])
+else
+       AM_CONDITIONAL(HAVE_LIBGTOP, true)
+       AC_DEFINE([HAVE_LIBGTOP],[1],[Have libgtop])
+       LIBS="$LIBS $LIBGTOP_LIBS"
+       CFLAGS="$CFLAGS $LIBGTOP_CFLAGS"
+fi
+
+
 
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
@@ -965,7 +993,7 @@ AC_ARG_WITH([ll],
      esac
     ],
     [AC_MSG_RESULT(--with-ll not specified)])
-AM_CONDITIONAL(WITH_LL, test x$llapi = xtrue)
+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?
@@ -1254,7 +1282,6 @@ src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
 src/testing/Makefile
-src/testing_old/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf