1 files changed, 14 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 3f6f152fd..9a8730392 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,6 +413,20 @@ 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
+
 
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])