[geos-commits] r3000 - trunk/macros

svn_geos at osgeo.org svn_geos at osgeo.org
Wed Jun 16 05:25:28 EDT 2010


Author: strk
Date: 2010-06-16 09:25:28 +0000 (Wed, 16 Jun 2010)
New Revision: 3000

Modified:
   trunk/macros/ac_pkg_swig.m4
Log:
Fix swig macro so it doesn't think version 2.0.0 is < 1.3.37


Modified: trunk/macros/ac_pkg_swig.m4
===================================================================
--- trunk/macros/ac_pkg_swig.m4	2010-06-01 15:15:03 UTC (rev 2999)
+++ trunk/macros/ac_pkg_swig.m4	2010-06-16 09:25:28 UTC (rev 3000)
@@ -24,6 +24,9 @@
 dnl @author Andrew Collier <abcollier at yahoo.com>
 dnl @version 2004-09-20
 dnl @license GPLWithACException
+dnl
+dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
+dnl
 
 AC_DEFUN([AC_PROG_SWIG],[
         AC_PATH_PROG([SWIG],[swig])
@@ -67,9 +70,9 @@
                         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=''
                         else



More information about the geos-commits mailing list