From 536a95fa132f31c706e36d59e8c2094132a68bcf Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Tue, 2 Jul 2013 20:15:41 +0000
Subject: [PATCH] #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
---
 NEWS                      |  2 ++
 configure.ac              | 10 ++++++----
 topology/test/Makefile.in |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 3161a8ff8..2f2f0ed87 100644
--- 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 457d2daec..ecaf53022 100644
--- 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 fe15e7af1..534d4899f 100644
--- 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
-- 
2.50.1