[GNUnet-SVN] r25505 - gnunet

[gnunet]

Author: wachs
Date: 2012-12-17 13:14:44 +0100 (Mon, 17 Dec 2012)
New Revision: 25505

Modified:
   gnunet/configure.ac
Log:
check for glib


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-12-17 11:52:25 UTC (rev 25504)
+++ gnunet/configure.ac 2012-12-17 12:14:44 UTC (rev 25505)
@@ -413,8 +413,22 @@
        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])
 if test x$nss = xfalse
 then