X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=a558ffd1e264c60b9d4c4b9b5092e4a0bccc484b;hb=dfba021b14dc9ee9cb961e892f5ca62eb6e10281;hp=9dd33ef8f9f22b88759fd81d42b0dae5d56c4ef0;hpb=f491ac4fab469421986f77df0bbf79fefc417786;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 9dd33ef8f..a558ffd1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2011 Christian Grothoff (and other contributing authors)
+# (C) 2001--2012 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.1],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.2],[bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([gnunet], [0.9.1])
+AM_INIT_AUTOMAKE([gnunet], [0.9.2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -320,29 +320,21 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-AC_ARG_ENABLE([ats],
-  [AS_HELP_STRING([--enable-ats], [enable ATS code])],
-  [enable_ats=${enableval}],
-  [enable_ats=no])
-if test x${enable_ats} = xyes
+
+AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
+AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
+# GLPK must support atm MLP presolving, version >= 4.32
+AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
+if test x$gplk = xfalse
 then
-	AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
-	AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
-	# GLPK must support atm MLP presolving, version >= 4.32
-	AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
-	if test x$gplk = xfalse
-	then
-		AM_CONDITIONAL(HAVE_LIBGLPK, false)
-		AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
-	else
-		AM_CONDITIONAL(HAVE_LIBGLPK, true)
-		AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
-	fi
-else
 	AM_CONDITIONAL(HAVE_LIBGLPK, false)
-	AC_MSG_RESULT([no])
+	AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
+else
+	AM_CONDITIONAL(HAVE_LIBGLPK, true)
+	AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
+
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -751,6 +743,28 @@ AC_ARG_WITH(sudo,
 AC_SUBST(SUDO_BINARY)
 
 
+# test for gnunetdns group name
+GNUNETDNS_GROUP=gnunetdns
+AC_MSG_CHECKING(for gnunetdns group name)
+AC_ARG_WITH(gnunetdns,
+  [  --with-gnunetdns=GRPNAME       name for gnunetdns group],
+  [AC_MSG_RESULT("$with_gnunetdns")
+   case $with_gnunetdns in
+   no)
+     GNUNETDNS_GROUP=gnunet
+     ;;
+   yes)
+     GNUNETDNS_GROUP=gnunetdns
+     ;;
+   *)
+     GNUNETDNS_GROUP=$with_gnunetdns
+    ;;
+   esac
+  ],
+  [AC_MSG_RESULT([gnunetdns])])
+AC_SUBST(GNUNETDNS_GROUP)
+
+
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -849,25 +863,32 @@ src/exit/Makefile
 src/fragmentation/Makefile
 src/fs/Makefile
 src/fs/fs.conf
+src/gns/Makefile
+src/gns/gns.conf
 src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/mesh/Makefile
 src/mesh/mesh.conf
+src/namestore/Makefile
+src/namestore/namestore.conf
 src/nat/Makefile
 src/nse/Makefile
 src/nse/nse.conf
 src/peerinfo/Makefile
 src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
+src/pt/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
+src/stream/Makefile
 src/template/Makefile
 src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf
+src/tun/Makefile
 src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile