diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-15 01:10:09 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-15 01:10:09 +0000 |
| commit | fa9b805e1c79fb09a537ef63bf22e500dcb8670e (patch) | |
| tree | b5bb51a13bc4c31caf42c9dfa4ccacafd2262d6b | |
| parent | c1b1721ad00a9a4e7b9f742ed55a4c5564a262fb (diff) | |
sra points out the django south check needs to avoid lexographic comparison of version numbers
closes #348
svn path=/trunk/; revision=4872
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 10 insertions, 7 deletions
@@ -4369,7 +4369,7 @@ $as_echo "$have_django_south" >&6; } then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django South 0.7.6 or later" >&5 $as_echo_n "checking for Django South 0.7.6 or later... " >&6; } - have_acceptable_django_south=`$PYTHON -c "import south; print 'no' if south.__version__ < '0.7.6' else 'yes'"` + have_acceptable_django_south=`$PYTHON -c "import south; print 'no' if map(int,south.__version__.split('.')) < [0, 7, 6] else 'yes'"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_django_south" >&5 $as_echo "$have_acceptable_django_south" >&6; } fi @@ -4418,17 +4418,20 @@ $as_echo "$as_me: WARNING: The RPKI CA tools require Django 1.2 or higher." >&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 $ok = no - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: If you do not wish to install the RPKI CA tools, please specify --disable-ca-tools as an argument to this configure script." >&5 -$as_echo "$as_me: WARNING: If you do not wish to install the RPKI CA tools, please specify --disable-ca-tools as an argument to this configure script." >&2;} - fi if test $have_acceptable_django_south = no then ok=no { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require Django South 0.7.6 or higher." >&5 $as_echo "$as_me: WARNING: The RPKI CA tools require Django South 0.7.6 or higher." >&2;} fi + # + # This should be the last test in this group, so that failures get the --disable-ca-tools warning. + # + if test $ok = no + then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: If you do not wish to install the RPKI CA tools, please specify --disable-ca-tools as an argument to this configure script." >&5 +$as_echo "$as_me: WARNING: If you do not wish to install the RPKI CA tools, please specify --disable-ca-tools as an argument to this configure script." >&2;} + fi ;; no) build_ca_tools=no ;; diff --git a/configure.ac b/configure.ac index ab35a2b5..cf23a4a6 100644 --- a/configure.ac +++ b/configure.ac @@ -305,7 +305,7 @@ then if test $have_django_south = yes then AC_MSG_CHECKING([for Django South 0.7.6 or later]) - have_acceptable_django_south=`$PYTHON -c "import south; print 'no' if south.__version__ < '0.7.6' else 'yes'"` + have_acceptable_django_south=`$PYTHON -c "import south; print 'no' if map(int,south.__version__.split('.')) < [[0, 7, 6]] else 'yes'"` AC_MSG_RESULT([$have_acceptable_django_south]) fi fi |