summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2011-02-09 16:08:19 +0000
committerTed Ross <tross@apache.org>2011-02-09 16:08:19 +0000
commit8f24af12ad55b4385eea901464885a95704eaf04 (patch)
tree8391bbf9e64306e69f658cd65c7d4488e16ff29e
parent89bcd94764e54eb471d4ef72369a92faa0694406 (diff)
downloadqpid-python-8f24af12ad55b4385eea901464885a95704eaf04.tar.gz
NO-JIRA - Replaced m4/ac_pkg_swig.m4 with updated version that works with newer
versions of Swig. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068956 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--extras/sasl/m4/ac_pkg_swig.m48
1 files changed, 5 insertions, 3 deletions
diff --git a/extras/sasl/m4/ac_pkg_swig.m4 b/extras/sasl/m4/ac_pkg_swig.m4
index 3bff433f80..6e385c067c 100644
--- a/extras/sasl/m4/ac_pkg_swig.m4
+++ b/extras/sasl/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