more information why nat tests fail

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 06ab80aceb3893e089892f20525a58f1fb2d1c38..3589bb14582089d5c7c8466054c29b1374e3d49e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2013 Christian Grothoff (and other contributing authors)
+# (C) 2001--2014 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,7 +22,7 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.10.0], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.10.1], [bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -473,11 +473,14 @@ if test "$libidn" != "no"; then
      LDFLAGS="${LDFLAGS} -L$libidn/lib"
      CPPFLAGS="${CPPFLAGS} -I$libidn/include"
   fi
-  AC_CHECK_HEADER(idna.h,
-    AC_CHECK_LIB(idn, stringprep_check_version,
-      [libidn=yes LIBS="${LIBS} -lidn"],
-      AC_MSG_FAILURE([GNUnet requires libidn])),
-    AC_MSG_FAILURE([GNUnet requires libidn]))
+fi
+libidn=no
+AC_CHECK_HEADER(idna.h,
+  AC_CHECK_LIB(idn, stringprep_check_version,
+    [libidn=yes LIBS="${LIBS} -lidn"], []), [])
+if test "$libidn" != "yes"; then
+  AC_MSG_FAILURE([GNUnet requires libidn.
+libidn-1.13 should be sufficient, newer versions work too.])
 fi
 AC_MSG_RESULT($libidn)
 
@@ -1529,7 +1532,7 @@ fi
 # sqlite
 if test "x$sqlite" = "x0"
 then
-  AC_MSG_NOTICE([NOTICE: sqlite not found.  sqLite support will not be compiled.])
+  AC_MSG_ERROR([ERROR: sqlite3 not found, but sqlite3 is required.])
 fi
 
 # libgnurl
@@ -1615,9 +1618,9 @@ to install everything.
 
 Each GNUnet user should be added to the 'gnunet' group (may
 require fresh login to come into effect):
-        adduser $USERNAME gnunet
+        adduser USERNAME gnunet
 (run the above command as root once for each of your users, replacing
-"$USERNAME" with the respective login names).  If you have a global IP
+"USERNAME" with the respective login names).  If you have a global IP
 address, no further configuration is required.
 
 Optionally, download and compile gnunet-gtk to get a GUI for