Bump minimum GEOS version to 3.6

Closes #4267

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

diff --git a/NEWS b/NEWS
index 5f48ce35f4ae61e2a8d200165467c9742d7e093d..341614122a483940db578ffee7ccda68e005a816 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PostGIS 3.0.0
 2019/xx/xx
 * Breaking Changes *
+  - #4267, Bump minimum GEOS version to 3.6 (Regina Obe)
   - #3888, Raster support now available as a separate extension
            (Sandro Santilli)
   - #3807, Extension library files no longer include the minor version.

diff --git a/configure.ac b/configure.ac
index a2c8628df6d743782054444399a62c4878c0d8f4..0f82df58a0026f2c032d57b0c25485a6b0f50df2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -686,10 +686,10 @@ 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.5.0
+dnl Ensure that we are using GEOS >= 3.6.0
 AC_MSG_RESULT([checking GEOS version... $GEOS_FULL_VERSION])
-if test ! "$GEOS_NUMERIC_VERSION" -ge 30500; then
-       AC_MSG_ERROR([PostGIS requires GEOS >= 3.5.0])
+if test ! "$GEOS_NUMERIC_VERSION" -ge 30600; then
+       AC_MSG_ERROR([PostGIS requires GEOS >= 3.6.0])
 fi
 
 dnl Extract the linker and include flags

diff --git a/doc/installation.xml b/doc/installation.xml
index dd26806c301f41e824e1ae8b0850043762c35ca9..077c0e0004f23f773d67244436ca1d72ba5e1bf8 100644 (file)
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -158,7 +158,7 @@ psql -d yourdatabase -f sfcgal_comments.sql
 
          <listitem>
                <para>
-                 GEOS geometry library, version 3.5 or greater, but GEOS 3.7+ is recommended to take full advantage of all the new functions and features.  You should have at least GEOS 3.5,
+                 GEOS geometry library, version 3.6 or greater, but GEOS 3.7+ is recommended to take full advantage of all the new functions and features.  You should have at least GEOS 3.5,
                        without which you will be missing some major enhancements such as <xref linkend="ST_ClipByBox2D" /> and <xref linkend="ST_Subdivide" />. GEOS is available for download from
                  <ulink url="http://trac.osgeo.org/geos/">
                        http://trac.osgeo.org/geos/

diff --git a/regress/core/Makefile.in b/regress/core/Makefile.in
index e42fa002837384f7740d64f6c865ff9f0c6dc2d9..5cb79aac16927851a6b4f69c519a7fb19dacad0c 100644 (file)
--- a/regress/core/Makefile.in
+++ b/regress/core/Makefile.in
@@ -161,15 +161,10 @@ TESTS = \
        voronoi \
        regress_brin_index \
        regress_brin_index_3d \
-       regress_brin_index_geography
-
-ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 36),1)
-       # GEOS-3.6 adds:
-       # ST_MinimumClearance
-       TESTS += \
-               minimum_clearance \
-               oriented_envelope
-endif
+       regress_brin_index_geography \
+       ST_MinimumClearance \
+       minimum_clearance \
+       oriented_envelope
 
 ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 37),1)
        # GEOS-3.7 adds: