Permalink
Browse files

Runtime version dependency for Tornado is 4.2 or higher.

svn path=/branches/tk705/; revision=6348
  • Loading branch information...
sraustein committed Apr 6, 2016
1 parent e3b1d4a commit 14c22156a9cd1e48280fad09338bba2ad6b97e7f
Showing with 25 additions and 5 deletions.
  1. +14 −3 configure
  2. +11 −2 configure.ac
View
@@ -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
View
@@ -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

0 comments on commit 14c2215

Please sign in to comment.