diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-10 19:45:15 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-10 19:45:15 +0000 |
| commit | 24aa9d2747e54be7f847186f5f4bd4407d7ea5b2 (patch) | |
| tree | 802375c626291d53bb6c28d60ff12d66ba1538de /configure.ac | |
| parent | 1f761984c9661d3652895e6c88828569faf5bca0 (diff) | |
More dependency updates (development branch). Probably broke
everything, but at least heading towards where we want to be rather
than bogged down in what used to work.
svn path=/branches/tk705/; revision=6245
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index a41ebeda..0d06dd5d 100644 --- a/configure.ac +++ b/configure.ac @@ -532,9 +532,9 @@ AC_MSG_CHECKING([for lxml.etree]) if $PYTHON -c 'import lxml.etree' 2>/dev/null; then have_lxml=yes; else have_lxml=no; fi AC_MSG_RESULT([$have_lxml]) -AC_MSG_CHECKING([for MySQLdb]) -if $PYTHON -c 'import MySQLdb' 2>/dev/null; then have_mysqldb=yes; else have_mysqldb=no; fi -AC_MSG_RESULT([$have_mysqldb]) +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]) AC_MSG_CHECKING([for Django]) if $PYTHON -c 'import django' 2>/dev/null; then have_django=yes; else have_django=no; fi @@ -582,7 +582,7 @@ then if test $have_python_h = no then build_ok=no - AC_MSG_WARN([I can't find Python.h. Python sources are required to build the RP tools.]) + AC_MSG_WARN([I can't find Python.h. Python sources are required to build the rpki.POW module.]) fi if test "x$RRDTOOL" = "x" then @@ -596,28 +596,37 @@ then fi fi +if test $have_lxml = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require the Python LXML package.]) +fi + +if test $have_acceptable_django = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require Django 1.8 or higher.]) +fi + +if test $have_argparse = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require the Python argparse module.]) +fi + +if test $have_tornado = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require the Python Tornado package.]) +fi + if test $build_ca_tools = yes then - if test $have_lxml = no - then - runtime_ok=no - AC_MSG_WARN([The RPKI tools require the Python LXML module.]) - fi - if test $have_acceptable_django = no - then - runtime_ok=no - AC_MSG_WARN([The RPKI CA tools require Django 1.8 or higher.]) - fi if test $have_vobject = no then runtime_ok=no AC_MSG_WARN([The RPKI CA GUI requires the Python vobject module.]) fi - if test $have_argparse = no - then - runtime_ok=no - AC_MSG_WARN([The RPKI CA tools require the Python argparse module.]) - fi if test $have_pyyaml = no then AC_MSG_WARN([PyYAML missing, so "make test" will not work properly.]) |