X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=42884d05bb19b9222d5a01e448d4392b84a42ab3;hb=cb023645f02e119debf6124da07b90554b8542aa;hp=c70c2229278c387ebe0a76ecb346637c2263e137;hpb=10460200168c53be3573c0761a6a0705b08ea5cb;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index c70c22292..42884d05b 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.4],[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.4])
+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])
@@ -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])
@@ -766,7 +794,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -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