← Back to branch summary

~sharpie/geos/3.3.2

« back to all changes in this revision

Viewing changes to macros/ac_pkg_swig.m4

  • Committer: Bazaar Package Importer
  • Author(s): Francesco Paolo Lovergine
  • Date: 2011-07-18 12:23:11 UTC
  • Revision ID: james.westby@ubuntu.com-20110718122311-n0cvqxlq0qux69af
Tags: 3.2.2-3
http://bugs.debian.org/631819
http://bugs.debian.org/616823
* New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4.
  Merged from 3.3 series. Thanks strk. (closes: #631819)
* Removed obsolete python build-deps, because now the suggested binding
  is via shapely. (closes: #616823)

Show diffs side-by-side

added added

removed removed

Lines of Context:
macros/ac_pkg_swig.m4
24
24
dnl @author Andrew Collier <abcollier@yahoo.com>
25
25
dnl @version 2004-09-20
26
26
dnl @license GPLWithACException
 
27
dnl
 
28
dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
 
29
dnl
27
30
 
28
31
AC_DEFUN([AC_PROG_SWIG],[
29
32
        AC_PATH_PROG([SWIG],[swig])
67
70
                        if test -z "$available_patch" ; then
68
71
                                [available_patch=0]
69
72
                        fi
70
 
                        if test $available_major -ne $required_major \
71
 
                                -o $available_minor -ne $required_minor \
72
 
                                -o $available_patch -lt $required_patch ; then
 
73
                        [required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]`
 
74
                        [available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
 
75
                        if test $available_full -lt $required_full; then
73
76
                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
74
77
                                SWIG=''
75
78
                        else