diff options
author | ng0 <ng0@n0.is> | 2019-02-14 16:41:09 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-02-14 16:41:09 +0000 |
commit | 783ac3513030b6006d117f156cfc068148757bcf (patch) | |
tree | 8d0e2cce1dc0a591c4c15ec0299d00dbfaac571f /configure.ac | |
parent | b54371bd5ca3d86e7e8383149975fdc31b14d0a7 (diff) | |
download | gnunet-783ac3513030b6006d117f156cfc068148757bcf.tar.gz gnunet-783ac3513030b6006d117f156cfc068148757bcf.zip |
Switch to python3.7 (integration-tests incomplete), continue using python2.7 for gnunet-qr with an incredible annoying workaround for autotools inability to deal with 2 major python versions at the same time
Signed-off-by: ng0 <ng0@n0.is>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f53d65006..5f10599be 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of GNUnet. | 1 | # This file is part of GNUnet. |
2 | # (C) 2001--2018 GNUnet e.V. | 2 | # (C) 2001--2019 GNUnet e.V. |
3 | # | 3 | # |
4 | # GNUnet is free software: you can redistribute it and/or modify it | 4 | # GNUnet is free software: you can redistribute it and/or modify it |
5 | # under the terms of the GNU Affero General Public License as published | 5 | # under the terms of the GNU Affero General Public License as published |
@@ -206,6 +206,13 @@ AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY) | |||
206 | AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) | 206 | AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n) |
207 | rm -f /tmp/gnunet_test_cosks_ssh_garbage | 207 | rm -f /tmp/gnunet_test_cosks_ssh_garbage |
208 | 208 | ||
209 | # autotools' m4 for python has no maximum version! | ||
210 | # python3.7 for tests | ||
211 | m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.7 python]) | ||
212 | AM_PATH_PYTHON([3.7],, [:]) | ||
213 | AC_SUBST([PYTHON]) | ||
214 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | ||
215 | |||
209 | # iptables is a soft requirement to run tests | 216 | # iptables is a soft requirement to run tests |
210 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) | 217 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) |
211 | 218 | ||
@@ -1208,10 +1215,6 @@ AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) | |||
1208 | # restore LIBS | 1215 | # restore LIBS |
1209 | LIBS=$SAVE_LIBS | 1216 | LIBS=$SAVE_LIBS |
1210 | 1217 | ||
1211 | # check for python & pexpect (used for some testcases only) | ||
1212 | AM_PATH_PYTHON([2.6],, [:]) | ||
1213 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | ||
1214 | |||
1215 | # check for gettext | 1218 | # check for gettext |
1216 | AM_GNU_GETTEXT([external]) | 1219 | AM_GNU_GETTEXT([external]) |
1217 | AM_GNU_GETTEXT_VERSION([0.18.1]) | 1220 | AM_GNU_GETTEXT_VERSION([0.18.1]) |