[cig-commits] r17050 - cs/autoconf/trunk

[brad at geodynamics.org]

Author: brad
Date: 2010-07-17 13:32:39 -0700 (Sat, 17 Jul 2010)
New Revision: 17050

Modified:
   cs/autoconf/trunk/ac_pkg_swig.m4
Log:
Fixed test of swig version (permit newer major and minor versions than required).

Modified: cs/autoconf/trunk/ac_pkg_swig.m4
===================================================================
--- cs/autoconf/trunk/ac_pkg_swig.m4	2010-07-16 22:19:51 UTC (rev 17049)
+++ cs/autoconf/trunk/ac_pkg_swig.m4	2010-07-17 20:32:39 UTC (rev 17050)
@@ -26,7 +26,7 @@
 #
 # LAST MODIFICATION
 #
-#   2008-04-12
+#   2010-07-17 (Brad Aagaard, permit newer major and minor versions than required)
 #
 # COPYLEFT
 #
@@ -103,11 +103,21 @@
                         if test -z "$available_patch" ; then
                                 [available_patch=0]
                         fi
-                        if test $available_major -lt $required_major \
-                                -o $available_minor -lt $required_minor \
-                                -o $available_patch -lt $required_patch ; then
+                        echo "required_major=$required_major"
+                        echo "required_minor=$required_minor"
+                        echo "required_patch=$required_patch"
+                        echo "available_major=$available_major"
+                        echo "available_minor=$available_minor"
+                        echo "available_patch=$available_patch"
+                        if test $available_major -lt $required_major ; then
                                 AC_MSG_FAILURE([SWIG version >= $1 is required.  You have $swig_version.  Go to http://www.swig.org to get the current version.])
                                 SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  Go to http://www.swig.org to get the current version." ; false'
+                        elif test $available_major -eq $required_major -a $available_minor -lt $required_minor ; then
+                                AC_MSG_FAILURE([SWIG version >= $1 is required.  You have $swig_version.  Go to http://www.swig.org to get the current version.])
+                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  Go to http://www.swig.org to get the current version." ; false'
+                        elif test $available_major -eq $required_major -a $available_minor -eq $required_minor -a $available_patch -lt $required_patch ; then
+                                AC_MSG_FAILURE([SWIG version >= $1 is required.  You have $swig_version.  Go to http://www.swig.org to get the current version.])
+                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  Go to http://www.swig.org to get the current version." ; false'
                         else
                                 AC_MSG_NOTICE([SWIG executable is '$SWIG'])
                                 SWIG_LIB=`$SWIG -swiglib`