[gnunet] branch master updated (95f938ac5 -> 7cc8068f0)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository gnunet.

    from 95f938ac5 -update pogen
     new 6cf2f6fed -bump version
     new 7cc8068f0 fixing misc. bugs in the configure script

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e18a3b502..3b66a368e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 #
 AC_PREREQ([2.69])
 # Checks for programs.
-AC_INIT([gnunet],[0.15.0],[bug-gnunet@gnu.org])
+AC_INIT([gnunet],[0.15.1],[bug-gnunet@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 
 # check for legacy option that is no longer supported (#5627) and fail hard
@@ -581,7 +581,7 @@ AS_IF([test "x$activate_texinfo4" = "xyes"],
   TEXINFO_HTMLFLAGS="--no-split --css-include=style.css 
--css-include=manual.css"
  ],[
   AM_CONDITIONAL([ACTIVATE_TEXINFO4],false)
-  AC_DEFINE([INCLUDE_MANPAGES],[0],[Using texinfo version 5 or later switches])
+  AC_DEFINE([ACTIVATE_TEXINFO04],[0],[Using texinfo version 5 or later 
switches])
   TEXINFO_HTMLFLAGS="--no-split --css-ref='../style.css' 
--css-ref='../manual.css'"
 
  ])
@@ -949,7 +949,7 @@ AC_ARG_WITH(libogg,
                       ogg=1,)])
 AM_CONDITIONAL(HAVE_OGG, [test "$ogg" = 1])
 AS_IF([test x"$ogg" = x1],
-      [AC_DEFINE([HAVE_OGG],[1],[Have ogg])]
+      [AC_DEFINE([HAVE_OGG],[1],[Have ogg])],
       [AC_DEFINE([HAVE_OGG],[0],[Lacking ogg])])
 
 
@@ -1299,8 +1299,9 @@ gl_LIBUNISTRING
 AS_IF([test $HAVE_LIBUNISTRING != yes],
       [AC_MSG_ERROR([GNUnet requires libunistring])])
 
-AS_VERSION_COMPARE([$LIBUNISTRING_VERSION],[0.9.1.1],
-  [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])])
+# Currently broken on Debian :-(
+#AS_VERSION_COMPARE([$LIBUNISTRING_VERSION],[0.9.1.1],
+#  [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1, found 
$LIBUNISTRING_VERSION])])
 
 AC_CHECK_HEADERS([unistr.h],
                  ,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.