diff options
author | t3sserakt <t3ss@posteo.de> | 2021-08-24 10:57:42 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-08-24 10:58:26 +0200 |
commit | 3d3d4a2ecadb2ab31cb6219db46489d1081f5ebc (patch) | |
tree | f527317fc5bb7573ab86ac7d83a4c3ae2c27707d /configure.ac | |
parent | 00cbe1e8e09fc2ef567f59de5b4dc14c0562c35f (diff) | |
parent | 1fe3ee7896fd7421fcb72d4e1b07cd55542a76f1 (diff) | |
download | gnunet-3d3d4a2ecadb2ab31cb6219db46489d1081f5ebc.tar.gz gnunet-3d3d4a2ecadb2ab31cb6219db46489d1081f5ebc.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 11 |
1 files 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 @@ | |||
21 | # | 21 | # |
22 | AC_PREREQ([2.69]) | 22 | AC_PREREQ([2.69]) |
23 | # Checks for programs. | 23 | # Checks for programs. |
24 | AC_INIT([gnunet],[0.15.0],[bug-gnunet@gnu.org]) | 24 | AC_INIT([gnunet],[0.15.1],[bug-gnunet@gnu.org]) |
25 | AC_CONFIG_AUX_DIR([build-aux]) | 25 | AC_CONFIG_AUX_DIR([build-aux]) |
26 | 26 | ||
27 | # check for legacy option that is no longer supported (#5627) and fail hard | 27 | # check for legacy option that is no longer supported (#5627) and fail hard |
@@ -581,7 +581,7 @@ AS_IF([test "x$activate_texinfo4" = "xyes"], | |||
581 | TEXINFO_HTMLFLAGS="--no-split --css-include=style.css --css-include=manual.css" | 581 | TEXINFO_HTMLFLAGS="--no-split --css-include=style.css --css-include=manual.css" |
582 | ],[ | 582 | ],[ |
583 | AM_CONDITIONAL([ACTIVATE_TEXINFO4],false) | 583 | AM_CONDITIONAL([ACTIVATE_TEXINFO4],false) |
584 | AC_DEFINE([INCLUDE_MANPAGES],[0],[Using texinfo version 5 or later switches]) | 584 | AC_DEFINE([ACTIVATE_TEXINFO04],[0],[Using texinfo version 5 or later switches]) |
585 | TEXINFO_HTMLFLAGS="--no-split --css-ref='../style.css' --css-ref='../manual.css'" | 585 | TEXINFO_HTMLFLAGS="--no-split --css-ref='../style.css' --css-ref='../manual.css'" |
586 | 586 | ||
587 | ]) | 587 | ]) |
@@ -949,7 +949,7 @@ AC_ARG_WITH(libogg, | |||
949 | ogg=1,)]) | 949 | ogg=1,)]) |
950 | AM_CONDITIONAL(HAVE_OGG, [test "$ogg" = 1]) | 950 | AM_CONDITIONAL(HAVE_OGG, [test "$ogg" = 1]) |
951 | AS_IF([test x"$ogg" = x1], | 951 | AS_IF([test x"$ogg" = x1], |
952 | [AC_DEFINE([HAVE_OGG],[1],[Have ogg])] | 952 | [AC_DEFINE([HAVE_OGG],[1],[Have ogg])], |
953 | [AC_DEFINE([HAVE_OGG],[0],[Lacking ogg])]) | 953 | [AC_DEFINE([HAVE_OGG],[0],[Lacking ogg])]) |
954 | 954 | ||
955 | 955 | ||
@@ -1299,8 +1299,9 @@ gl_LIBUNISTRING | |||
1299 | AS_IF([test $HAVE_LIBUNISTRING != yes], | 1299 | AS_IF([test $HAVE_LIBUNISTRING != yes], |
1300 | [AC_MSG_ERROR([GNUnet requires libunistring])]) | 1300 | [AC_MSG_ERROR([GNUnet requires libunistring])]) |
1301 | 1301 | ||
1302 | AS_VERSION_COMPARE([$LIBUNISTRING_VERSION],[0.9.1.1], | 1302 | # Currently broken on Debian :-( |
1303 | [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])]) | 1303 | #AS_VERSION_COMPARE([$LIBUNISTRING_VERSION],[0.9.1.1], |
1304 | # [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1, found $LIBUNISTRING_VERSION])]) | ||
1304 | 1305 | ||
1305 | AC_CHECK_HEADERS([unistr.h], | 1306 | AC_CHECK_HEADERS([unistr.h], |
1306 | , | 1307 | , |