Skip to content

Commit

Permalink
Remove Geos 3.4 guards
Browse files Browse the repository at this point in the history
References #4069
Closes #4142
Closes #284


git-svn-id: http://svn.osgeo.org/postgis/trunk@16681 b70326c6-7e19-0410-871a-916f4a2858ee
  • Loading branch information
Raúl Marín Rodríguez committed Aug 2, 2018
1 parent 27b9aff commit 2deda8f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 25 deletions.
3 changes: 0 additions & 3 deletions configure.ac
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions liblwgeom/cunit/cu_triangulate.c
Expand Up @@ -18,7 +18,6 @@

static void test_lwgeom_delaunay_triangulation(void)
{
#if POSTGIS_GEOS_VERSION >= 34
LWGEOM *in, *tmp, *out;
char *wkt, *exp_wkt;

Expand All @@ -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)
Expand Down
25 changes: 6 additions & 19 deletions regress/Makefile.in
Expand Up @@ -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:
Expand Down

0 comments on commit 2deda8f

Please sign in to comment.