diff options
| author | Nuno Santos <nsantos@apache.org> | 2010-07-27 20:20:05 +0000 |
|---|---|---|
| committer | Nuno Santos <nsantos@apache.org> | 2010-07-27 20:20:05 +0000 |
| commit | 204dcb7f9566ca36bdaaf0ce1b366c8a99b0e39d (patch) | |
| tree | 5c24a1a9d3a613eb7dda0ded675f2725de270cdd | |
| parent | d4e5573151bebd09883cc5d6bacf7224b6564671 (diff) | |
| download | qpid-python-204dcb7f9566ca36bdaaf0ce1b366c8a99b0e39d.tar.gz | |
fix for autoconf swig version comparison macro, AC_PROG_SWIG
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@979841 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/m4/ac_pkg_swig.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/m4/ac_pkg_swig.m4 b/cpp/m4/ac_pkg_swig.m4 index 3bff433f80..6e385c067c 100644 --- a/cpp/m4/ac_pkg_swig.m4 +++ b/cpp/m4/ac_pkg_swig.m4 @@ -56,6 +56,8 @@ # Macro released by the Autoconf Archive. When you make and distribute a # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. +# +# Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15) AC_DEFUN([AC_PROG_SWIG],[ AC_PATH_PROG([SWIG],[swig]) @@ -99,9 +101,9 @@ AC_DEFUN([AC_PROG_SWIG],[ if test -z "$available_patch" ; then [available_patch=0] fi - if test $available_major -ne $required_major \ - -o $available_minor -ne $required_minor \ - -o $available_patch -lt $required_patch ; then + [required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]` + [available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]` + if test $available_full -lt $required_full; then AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org]) SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' else |