diff options
author | ng0 <ng0@n0.is> | 2019-10-24 10:20:13 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-10-24 10:20:13 +0000 |
commit | 7bacf9e51edaa9ccb30a4e13b45df9931ea4256d (patch) | |
tree | c98e312c43d9d92f45cacf1b4e7c6b24d648c626 | |
parent | 2767a0a55b20369e9206f6e8dcd93373324f3b69 (diff) | |
download | gnunet-7bacf9e51edaa9ccb30a4e13b45df9931ea4256d.tar.gz gnunet-7bacf9e51edaa9ccb30a4e13b45df9931ea4256d.zip |
Add python3.8 to configure.ac, some minor formating and solve one TODO.
-rw-r--r-- | configure.ac | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 13c1cad35..bf4e13320 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -228,8 +228,10 @@ AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHosts | |||
228 | rm -f /tmp/gnunet_test_cosks_ssh_garbage | 228 | rm -f /tmp/gnunet_test_cosks_ssh_garbage |
229 | 229 | ||
230 | # autotools' m4 for python has no maximum version! | 230 | # autotools' m4 for python has no maximum version! |
231 | # python3.4 - python3.7 for tests | 231 | # python3.4 - python3.8 for tests (3.8 unchecked) |
232 | m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python]) | 232 | # TODO: document how to override the lowest version |
233 | # TODO: found by this. | ||
234 | m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python3.8 python]) | ||
233 | AM_PATH_PYTHON([3.4],, [:]) | 235 | AM_PATH_PYTHON([3.4],, [:]) |
234 | AC_SUBST([PYTHON]) | 236 | AC_SUBST([PYTHON]) |
235 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | 237 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) |
@@ -359,10 +361,10 @@ AS_IF([test $gcrypt = 0], | |||
359 | AC_MSG_ERROR([[ | 361 | AC_MSG_ERROR([[ |
360 | *** | 362 | *** |
361 | *** You need libgcrypt to build this program. | 363 | *** You need libgcrypt to build this program. |
362 | ** This library is for example available at | 364 | *** This library is for example available at |
363 | *** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ | 365 | *** ftp://ftp.gnupg.org/gcrypt/libgcrypt/. |
364 | *** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) | 366 | *** At least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) |
365 | *** is required.) | 367 | *** is required. |
366 | ***]]) | 368 | ***]]) |
367 | ]) | 369 | ]) |
368 | AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) | 370 | AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) |
@@ -411,8 +413,9 @@ AC_MSG_RESULT($texi2mdoc_generation) | |||
411 | AS_IF([test "x$texi2mdoc_generation" = "xyes"], | 413 | AS_IF([test "x$texi2mdoc_generation" = "xyes"], |
412 | [AS_IF([test "$texi2mdoc" = 0], | 414 | [AS_IF([test "$texi2mdoc" = 0], |
413 | [AC_MSG_WARN([ERROR: transpiled mdoc output requires texi2mdoc.]) | 415 | [AC_MSG_WARN([ERROR: transpiled mdoc output requires texi2mdoc.]) |
414 | AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your Operating System]) | 416 | AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your]) |
415 | AC_MSG_WARN([ERROR: package manager or from https://mandoc.bsd.lv/texi2mdoc/])], | 417 | AC_MSG_WARN([ERROR: Operating System package manager or from]) |
418 | AC_MSG_WARN([ERROR: https://mandoc.bsd.lv/texi2mdoc/])], | ||
416 | [AM_CONDITIONAL([TEXI2MDOC_GENERATION],true) | 419 | [AM_CONDITIONAL([TEXI2MDOC_GENERATION],true) |
417 | AC_DEFINE([TEXI2MDOC_GENERATION], | 420 | AC_DEFINE([TEXI2MDOC_GENERATION], |
418 | [1], | 421 | [1], |
@@ -426,7 +429,8 @@ AS_IF([test "x$texi2mdoc_generation" = "xyes"], | |||
426 | # should the build process be building only the documentation? | 429 | # should the build process be building only the documentation? |
427 | AC_MSG_CHECKING(whether to build only documentation) | 430 | AC_MSG_CHECKING(whether to build only documentation) |
428 | AC_ARG_ENABLE([documentation-only], | 431 | AC_ARG_ENABLE([documentation-only], |
429 | [AS_HELP_STRING([--enable-documentation-only], [build only the documentation])], | 432 | [AS_HELP_STRING([--enable-documentation-only], |
433 | [build only the documentation])], | ||
430 | [documentation_only=${enableval}], | 434 | [documentation_only=${enableval}], |
431 | [documentation_only=no]) | 435 | [documentation_only=no]) |
432 | AC_MSG_RESULT($documentation_only) | 436 | AC_MSG_RESULT($documentation_only) |
@@ -436,15 +440,14 @@ AS_IF([test "x$documentation_only" = "xyes"], | |||
436 | AC_DEFINE([DOCUMENTATION_ONLY],[1],[Building only the documentation]) | 440 | AC_DEFINE([DOCUMENTATION_ONLY],[1],[Building only the documentation]) |
437 | ],[ | 441 | ],[ |
438 | AM_CONDITIONAL([DOCUMENTATION_ONLY],false) | 442 | AM_CONDITIONAL([DOCUMENTATION_ONLY],false) |
439 | # TODO: Double negation might be a bit hard to parse for some | 443 | AC_DEFINE([DOCUMENTATION_ONLY],[0],[Doing a normal build, more than only documentation]) |
440 | # TODO: people reading the output. | ||
441 | AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation]) | ||
442 | ]) | 444 | ]) |
443 | 445 | ||
444 | # should the build process be including the manpages? (default: yes) | 446 | # should the build process be including the manpages? (default: yes) |
445 | AC_MSG_CHECKING(whether to include man pages) | 447 | AC_MSG_CHECKING(whether to include man pages) |
446 | AC_ARG_ENABLE([include-manpages], | 448 | AC_ARG_ENABLE([include-manpages], |
447 | [AS_HELP_STRING([--disable-include-manpages], [Do not include the man pages in build and installation])], | 449 | [AS_HELP_STRING([--disable-include-manpages], |
450 | [Do not include the man pages in build and installation])], | ||
448 | [include_manpages=${enableval}], | 451 | [include_manpages=${enableval}], |
449 | [include_manpages=yes]) | 452 | [include_manpages=yes]) |
450 | AC_MSG_RESULT($include_manpages) | 453 | AC_MSG_RESULT($include_manpages) |