Initial switches for use of GEOS C-API

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

diff --git a/CHANGES b/CHANGES
index 7b08fb195e6e254717b1f70bfa6e992c7a1c75fe..9caf90b66742000ec464a454f41a60173ee0a86f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ PostGIS 1.1.0CVS
        - NEW M(point) function
        - NEW LineMerge(geometry) function
        - JTS support improvements
+       - Initial GEOS C-API support
        - Removed automatic call to fix_geometry_columns() in
          AddGeometryColumns() and update_geometry_stats()
 

diff --git a/Makefile.config.in b/Makefile.config.in
index f35058cb0840d1c0a574047723149e76cc2c2f47..4b0c8a61dda37eda66c71d74e0741fd685717cc9 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -32,6 +32,8 @@ PROJ_DIR=@PROJ_DIR@
 #
 USE_GEOS=@USE_GEOS@
 GEOS_DIR=@GEOS_DIR@
+# EXPERIMENTAL! use geos C-API (only available with GEOS-3.x.x and up)
+USE_GEOS_CAPI=0
 
 #
 # Set USE_JTS to 1 if you have libjts installed. 

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index a7aeeebf83fb7df87cd021a5a12169c384bf7f6c..d71cd148e06211005626cdeb16682fb4e2da79f6 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -35,12 +35,19 @@ override CFLAGS += -DPOSTGIS_BUILD_DATE='"$(POSTGIS_BUILD_DATE)"'
 
 JTS_OBJ=lwgeom_nojts.o
 ifeq ($(USE_GEOS),1)
-       CXXFLAGS += -I$(GEOS_DIR)/include 
        CSTAR_FLAGS += -DUSE_GEOS
        GEOS_RULES=detect_geos_version
-       GEOS_WRAPPER=lwgeom_geos_wrapper.o
-       JTS_OBJ=lwgeom_geos.o
-       SHLIB_LINK += -lstdc++ -L$(GEOS_DIR)/lib -lgeos
+       ifeq ($(USE_GEOS_CAPI),1)
+               CSTAR_FLAGS += -I$(GEOS_DIR)/include 
+               GEOS_WRAPPER=
+               JTS_OBJ=lwgeom_geos_c.o
+               SHLIB_LINK += -L$(GEOS_DIR)/lib -lgeos_c
+       else
+               CXXFLAGS += -I$(GEOS_DIR)/include 
+               GEOS_WRAPPER=lwgeom_geos_wrapper.o
+               JTS_OBJ=lwgeom_geos.o
+               SHLIB_LINK += -lstdc++ -L$(GEOS_DIR)/lib -lgeos
+       endif
 endif
 
 ifeq ($(USE_JTS),1)
@@ -104,6 +111,8 @@ lwgeom_geos_wrapper.o: lwgeom_geos_wrapper.cpp
 
 lwgeom_geos.o: lwgeom_geos.c profile.h
 
+lwgeom_geos_c.o: lwgeom_geos_c.c profile.h
+
 lwgeom_jts.o: lwgeom_jts.c profile.h
 
 lwgeom_nojts.o: lwgeom_nojts.c