[postgis-tickets] r16681 - Remove Geos 3.4 guards

[Raul]

Author: algunenano
Date: 2018-08-02 03:07:16 -0700 (Thu, 02 Aug 2018)
New Revision: 16681

Modified:
   trunk/configure.ac
   trunk/liblwgeom/cunit/cu_triangulate.c
   trunk/regress/Makefile.in
Log:
Remove Geos 3.4 guards

References #4069
Closes #4142
Closes https://github.com/postgis/postgis/pull/284


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2018-08-01 18:32:50 UTC (rev 16680)
+++ trunk/configure.ac	2018-08-02 10:07:16 UTC (rev 16681)
@@ -1181,9 +1181,6 @@
 
     TOPOLOGY="topology"
     AC_MSG_RESULT([TOPOLOGY: Topology support requested])
-	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
     AC_MSG_RESULT([TOPOLOGY: Topology support disabled])
 fi

Modified: trunk/liblwgeom/cunit/cu_triangulate.c
===================================================================
--- trunk/liblwgeom/cunit/cu_triangulate.c	2018-08-01 18:32:50 UTC (rev 16680)
+++ trunk/liblwgeom/cunit/cu_triangulate.c	2018-08-02 10:07:16 UTC (rev 16681)
@@ -18,7 +18,6 @@
 
 static void test_lwgeom_delaunay_triangulation(void)
 {
-#if POSTGIS_GEOS_VERSION >= 34
 	LWGEOM *in, *tmp, *out;
 	char *wkt, *exp_wkt;
 
@@ -42,8 +41,6 @@
 	}
 	CU_ASSERT_STRING_EQUAL(wkt, exp_wkt);
 	lwfree(wkt);
-
-#endif /* POSTGIS_GEOS_VERSION >= 34 */
 }
 
 static void test_lwgeom_voronoi_diagram(void)

Modified: trunk/regress/Makefile.in
===================================================================
--- trunk/regress/Makefile.in	2018-08-01 18:32:50 UTC (rev 16680)
+++ trunk/regress/Makefile.in	2018-08-02 10:07:16 UTC (rev 16681)
@@ -192,35 +192,22 @@
 	clean \
 	relate_bnr
 
+# GEOS-3.4 adds:
+# ST_DelaunayTriangles
+TESTS += \
+	delaunaytriangles
 
-ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 34),1)
-	# GEOS-3.4 adds:
-	# ST_DelaunayTriangles
-	TESTS += \
-		delaunaytriangles
-endif
 
 
 ifeq ($(INTERRUPTTESTS),yes)
 	# Allow CI servers to configure --with-interrupt-tests
 	TESTS += \
-  	interrupt
-
-ifeq ($(shell expr $(GEOS_NUMERIC_VERSION) ">=" 30403),1)
-	TESTS += \
-		interrupt_relate
-endif
-
-ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 34),1)
-	# GEOS-3.4 adds:
-	# ST_DelaunayTriangles
-	TESTS += \
+		interrupt \
+		interrupt_relate \
 		interrupt_buffer
 endif
 
-endif
 
-
 ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 35),1)
 	# GEOS-3.5 adds:
 	# ST_ClipByBox2d, ST_Subdivide, ST_Voronoi