diff options
| author | Rob Austein <sra@hactrn.net> | 2013-05-07 22:50:58 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-05-07 22:50:58 +0000 |
| commit | 61f1084510d3999d864a181e2d39e894458025bc (patch) | |
| tree | b0f1d5a1d2485ef7cefdbf73e149ba3ebb61873a | |
| parent | a757c5f251a71c414ddbe8975e04414cb3de104a (diff) | |
Check for argparse.
svn path=/trunk/; revision=5330
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 32 insertions, 3 deletions
@@ -4588,6 +4588,7 @@ have_pyyaml=no have_vobject=no have_django_south=no have_acceptable_django_south=no +have_argparse=no if test "x$PYTHON" != "x" then @@ -4686,6 +4687,15 @@ $as_echo_n "checking for Django South 0.7.5 or later... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_django_south" >&5 $as_echo "$have_acceptable_django_south" >&6; } fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for argparse" >&5 +$as_echo_n "checking for argparse... " >&6; } + if $PYTHON -c 'import argparse' 2>/dev/null + then + have_argparse=yes + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_argparse" >&5 +$as_echo "$have_argparse" >&6; } fi ok=yes @@ -4730,8 +4740,8 @@ $as_echo "$as_me: WARNING: The RPKI CA tools require Django 1.3.7 or higher." >& if test $have_vobject = no then ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA GUI requires the Python vobject module" >&5 -$as_echo "$as_me: WARNING: The RPKI CA GUI requires the Python vobject module" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA GUI requires the Python vobject module." >&5 +$as_echo "$as_me: WARNING: The RPKI CA GUI requires the Python vobject module." >&2;} fi if test $have_acceptable_django_south = no then @@ -4739,6 +4749,12 @@ $as_echo "$as_me: WARNING: The RPKI CA GUI requires the Python vobject module" > { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require Django South 0.7.5 or higher." >&5 $as_echo "$as_me: WARNING: The RPKI CA tools require Django South 0.7.5 or higher." >&2;} fi + if test $have_argparse = no + then + ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require the Python argparse module." >&5 +$as_echo "$as_me: WARNING: The RPKI CA tools require the Python argparse module." >&2;} + fi # # This should be the last test in this group, so that failures get the --disable-ca-tools warning. # diff --git a/configure.ac b/configure.ac index f9f917ec..e3d9954f 100644 --- a/configure.ac +++ b/configure.ac @@ -427,6 +427,7 @@ have_pyyaml=no have_vobject=no have_django_south=no have_acceptable_django_south=no +have_argparse=no if test "x$PYTHON" != "x" then @@ -497,6 +498,13 @@ then have_acceptable_django_south=`$PYTHON -c "import south; print 'no' if map(int,south.__version__.split('.')) < [[0, 7, 5]] else 'yes'"` AC_MSG_RESULT([$have_acceptable_django_south]) fi + + AC_MSG_CHECKING([for argparse]) + if $PYTHON -c 'import argparse' 2>/dev/null + then + have_argparse=yes + fi + AC_MSG_RESULT([$have_argparse]) fi ok=yes @@ -537,13 +545,18 @@ case $enable_ca_tools in if test $have_vobject = no then ok=no - AC_MSG_WARN([The RPKI CA GUI requires the Python vobject module]) + AC_MSG_WARN([The RPKI CA GUI requires the Python vobject module.]) fi if test $have_acceptable_django_south = no then ok=no AC_MSG_WARN([The RPKI CA tools require Django South 0.7.5 or higher.]) fi + if test $have_argparse = no + then + ok=no + AC_MSG_WARN([The RPKI CA tools require the Python argparse module.]) + fi # # This should be the last test in this group, so that failures get the --disable-ca-tools warning. # |