- doxygen

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d28de60afd4f803d0c2b3e5d52eea29359d108b..c676164be1e288bb022e93f493cae87edd69d79a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -421,19 +421,7 @@ 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])
 if test x$nss = xfalse
@@ -1291,10 +1279,12 @@ src/gns/Makefile
 src/gns/gns.conf
 src/gns/nss/Makefile
 src/hello/Makefile
-src/include/Makefile
-src/include/gnunet_directories.h
 src/identity/Makefile
 src/identity/identity.conf
+src/psycstore/Makefile
+src/include/Makefile
+src/include/gnunet_directories.h
+src/integration-tests/Makefile
 src/hostlist/Makefile
 src/lockmanager/Makefile
 src/lockmanager/lockmanager.conf
@@ -1313,6 +1303,8 @@ src/postgres/Makefile
 src/pt/Makefile
 src/regex/Makefile
 src/regex/regex.conf
+src/scalarproduct/Makefile
+src/scalarproduct/scalarproduct.conf
 src/set/Makefile
 src/set/set.conf
 src/statistics/Makefile
@@ -1329,7 +1321,6 @@ src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
-src/integration-tests/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc