diff options
| author | Rob Austein <sra@hactrn.net> | 2016-04-06 02:47:51 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-04-06 02:47:51 +0000 |
| commit | 14c22156a9cd1e48280fad09338bba2ad6b97e7f (patch) | |
| tree | ff3d60167d7d7d69c12a6ac1dff025ae05b1af58 | |
| parent | e3b1d4a8c2ba37e1e0ede0e3a3f5f9207a79be3b (diff) | |
Runtime version dependency for Tornado is 4.2 or higher.
svn path=/branches/tk705/; revision=6348
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 25 insertions, 5 deletions
@@ -4700,6 +4700,17 @@ if $PYTHON -c 'import tornado' 2>/dev/null; then have_tornado=yes; else have_tor { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_tornado" >&5 $as_echo "$have_tornado" >&6; } +if test $have_tornado = yes +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tornado 4.2 or higher" >&5 +$as_echo_n "checking for Tornado 4.2 or higher... " >&6; } + have_acceptable_tornado=`$PYTHON -c "import tornado; print 'no' if tornado.version_info < (4, 2) else 'yes'"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_tornado" >&5 +$as_echo "$have_acceptable_tornado" >&6; } +else + have_acceptable_tornado=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django" >&5 $as_echo_n "checking for Django... " >&6; } if $PYTHON -c 'import django' 2>/dev/null; then have_django=yes; else have_django=no; fi @@ -4795,11 +4806,11 @@ then $as_echo "$as_me: WARNING: The RPKI tools require the Python argparse module." >&2;} fi -if test $have_tornado = no +if test $have_acceptable_tornado = no then runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python Tornado package." >&5 -$as_echo "$as_me: WARNING: The RPKI tools require the Python Tornado package." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require Tornado 4.2 or higher." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require Tornado 4.2 or higher." >&2;} fi if test $build_ca_tools = yes diff --git a/configure.ac b/configure.ac index 88480853..d701981b 100644 --- a/configure.ac +++ b/configure.ac @@ -435,6 +435,15 @@ AC_MSG_CHECKING([for Tornado]) if $PYTHON -c 'import tornado' 2>/dev/null; then have_tornado=yes; else have_tornado=no; fi AC_MSG_RESULT([$have_tornado]) +if test $have_tornado = yes +then + AC_MSG_CHECKING([for Tornado 4.2 or higher]) + have_acceptable_tornado=`$PYTHON -c "import tornado; print 'no' if tornado.version_info < (4, 2) else 'yes'"` + AC_MSG_RESULT([$have_acceptable_tornado]) +else + have_acceptable_tornado=no +fi + AC_MSG_CHECKING([for Django]) if $PYTHON -c 'import django' 2>/dev/null; then have_django=yes; else have_django=no; fi AC_MSG_RESULT([$have_django]) @@ -513,10 +522,10 @@ then AC_MSG_WARN([The RPKI tools require the Python argparse module.]) fi -if test $have_tornado = no +if test $have_acceptable_tornado = no then runtime_ok=no - AC_MSG_WARN([The RPKI tools require the Python Tornado package.]) + AC_MSG_WARN([The RPKI tools require Tornado 4.2 or higher.]) fi if test $build_ca_tools = yes |