Remove Geos 3.4 guards

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

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

diff --git a/configure.ac b/configure.ac
index 5b9769f9ea8dbb90bb76e7defc4f9d8bc5d348b6..48e2cf25ee85614d09399aaf531c84233cb01d11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1181,9 +1181,6 @@ if test "x$with_topology" != "xno"; then
 
     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

diff --git a/liblwgeom/cunit/cu_triangulate.c b/liblwgeom/cunit/cu_triangulate.c
index f2a30a4279e41915549ecf52adb24666367b5534..6770202dd33316ef1f5c5f25fdfa13ada4131e5c 100644 (file)
--- a/liblwgeom/cunit/cu_triangulate.c
+++ b/liblwgeom/cunit/cu_triangulate.c
@@ -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 @@ static void test_lwgeom_delaunay_triangulation(void)
        }
        CU_ASSERT_STRING_EQUAL(wkt, exp_wkt);
        lwfree(wkt);
-
-#endif /* POSTGIS_GEOS_VERSION >= 34 */
 }
 
 static void test_lwgeom_voronoi_diagram(void)

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 8f837b1ad232ae5ddf36630b87cd3bce7681165c..874d0bba872c1da45a5bf05a00867aac41dca27c 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -192,34 +192,21 @@ TESTS += \
        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: