#2371, Support GEOS versions with more than 1 digit in micro

git-svn-id: http://svn.osgeo.org/postgis/trunk@11612 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index 3161a8ff882e6c355a9522453f6394041bb75878..2f2f0ed87c744cbc2549bdf618cb2c29a2dee70b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PostGIS 2.2.0
 
  * Bug Fixes *
 
+  - #2371, Support GEOS versions with more than 1 digit in micro
+
 PostGIS 2.1.0
 2013/MM/DD
 

diff --git a/configure.ac b/configure.ac
index 457d2daecf2b80bf93c3c614ba27eb502ebbe289..ecaf5302280a3037ff3f65513f5a927eee707261 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -576,11 +576,13 @@ if test "x$GEOS_PATCH_VERSION" = "x"; then
 fi
 GEOS_FULL_VERSION=`$GEOSCONFIG --version`
 POSTGIS_GEOS_VERSION="$GEOS_MAJOR_VERSION$GEOS_MINOR_VERSION"
-GEOS_NUMERIC_VERSION="$GEOS_MAJOR_VERSION$GEOS_MINOR_VERSION$GEOS_PATCH_VERSION"
+GEOS_NUMERIC_PATCH_VERSION=`printf "%02d" $GEOS_PATCH_VERSION`
+GEOS_NUMERIC_MINOR_VERSION=`printf "%02d" $GEOS_MINOR_VERSION`
+GEOS_NUMERIC_VERSION="$GEOS_MAJOR_VERSION$GEOS_NUMERIC_MINOR_VERSION$GEOS_NUMERIC_PATCH_VERSION"
 
 dnl Ensure that we are using GEOS >= 3.3.0
 AC_MSG_RESULT([checking GEOS version... $GEOS_FULL_VERSION])
-if test ! "$GEOS_NUMERIC_VERSION" -ge 330; then
+if test ! "$GEOS_NUMERIC_VERSION" -ge 30300; then
        AC_MSG_ERROR([PostGIS requires GEOS >= 3.3.0])
 fi
 
@@ -912,7 +914,7 @@ if test "x$with_topology" != "xno"; then
 
     TOPOLOGY="topology"
     AC_MSG_RESULT([TOPOLOGY: Topology support requested])
-       if test "$GEOS_NUMERIC_VERSION" -lt 332; then
+       if test "$GEOS_NUMERIC_VERSION" -lt 30302; then
                AC_MSG_ERROR([Topology requires GEOS version >= 3.3.2. Use --without-topology or install a newer GEOS.])
        fi
 else
@@ -1243,7 +1245,7 @@ AC_MSG_RESULT([  convert:              ${IMAGEMAGICK}])
 AC_MSG_RESULT([  mathml2.dtd:          ${MATHML2_DTD}])
 AC_MSG_RESULT()
 
-if test "$GEOS_NUMERIC_VERSION" -lt 332; then
+if test "$GEOS_NUMERIC_VERSION" -lt 30302; then
 AC_MSG_RESULT([ --------- GEOS VERSION NOTICE ------------ ])
 AC_MSG_RESULT([  You are building against GEOS ${GEOS_FULL_VERSION} ])
 AC_MSG_RESULT([  To take advantage of all the features of ])

diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index fe15e7af1cbc95b947915d5b483bb64241fd1c1e..534d4899f0c9f3758d271ddf82b0bc2376399c3e 100644 (file)
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -71,7 +71,7 @@ TESTS = regress/legacy_validate.sql regress/legacy_predicate.sql \
 TESTS_EXPECTED = $(TESTS:.sql=_expected)
 
 regress/topogeo_addlinestring_expected: Makefile
-ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 338),1)
+ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 30308),1)
        cp regress/topogeo_addlinestring_expected_newsnap regress/topogeo_addlinestring_expected
 else
        cp regress/topogeo_addlinestring_expected_oldsnap regress/topogeo_addlinestring_expected