-auto-load hostkeys, minor bugfixes

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a861bd40979bd9d00d9f6182c9ccfdb8a0559785..e711a12a9c19445c0f7dc97a5e9abff4cf7648bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,13 +22,13 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.9.2],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.3],[bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([gnunet], [0.9.2])
+AM_INIT_AUTOMAKE([gnunet], [0.9.3])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -162,6 +162,11 @@ netbsd*)
      UNIXONLY=""
      funcstocheck=""
      ;;
+gnu*)
+     AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system])
+     build_target="gnu"
+     UNIXONLY="#"
+     ;;
 *)
      AC_MSG_RESULT(Unrecognised OS $host_os)
      AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
@@ -184,6 +189,7 @@ AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")
 AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd")
 AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd")
 AM_CONDITIONAL(LINUX, test "$build_target" = "linux")
+AM_CONDITIONAL(GNU, test "$build_target" = "gnu")
 
 AC_MSG_RESULT([$build_target])
 AC_SUBST(build_target)
@@ -320,7 +326,7 @@ AC_LANG_POP(C)
 fi     # $build = $target
 
 # libcurl
-LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
+LIBCURL_CHECK_CONFIG(,7.21.3,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.21.3]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -341,7 +347,7 @@ fi
 
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
-if test x$nss = xnss
+if test x$nss = xfalse
 then
        AM_CONDITIONAL(HAVE_GLIBCNSS, false)
        AC_MSG_WARN([No GNU libc nss header, will not build NSS plugin])
@@ -1052,6 +1058,7 @@ src/stream/Makefile
 src/template/Makefile
 src/testbed/Makefile
 src/testing/Makefile
+src/testing_old/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf