* m4/swig.m4: Here. --- ChangeLog | 6 ++++++ m4/swig.m4 | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f272c2..ef23d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-29 Roland Levillain <roland@lrde.epita.fr> + + Have AC_PROG_SWIG be more flexible w.r.t. major/minor version numbers. + + * m4/swig.m4: Here. + 2010-04-01 Roland Levillain <roland@lrde.epita.fr> Stop configuring swilena/python/sps and swilena/python/sps-local. diff --git a/m4/swig.m4 b/m4/swig.m4 index ad0ee3b..46672c5 100644 --- a/m4/swig.m4 +++ b/m4/swig.m4 @@ -61,9 +61,12 @@ 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 + if test \ + $available_major -lt $required_major \ + -o \( $available_major -eq $required_major \ + -a \( $available_minor -lt $required_minor \ + -o \( $available_minor -eq $required_minor \ + -a $available_patch -lt $required_patch \) \) \) ; 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 -- 1.5.6.5