diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-23 13:26:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-23 13:26:26 +0200 |
commit | 7cc8068f0601a7847ac7c47f88f49cd512da09b5 (patch) | |
tree | b00e6967993f4a82b5c4cac7f8be5f0a1c0bab0f | |
parent | 6cf2f6fed32c741934ba160158a4a90bd488a7c8 (diff) | |
download | gnunet-7cc8068f0601a7847ac7c47f88f49cd512da09b5.tar.gz gnunet-7cc8068f0601a7847ac7c47f88f49cd512da09b5.zip |
fixing misc. bugs in the configure scriptv0.15.1
-rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 81936e8c5..3b66a368e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -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 | , |