geos version detector and wrapper used from parent directory

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

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index 8fb2164d01f91eb7833c9fe9a706953e5ec5748e..9faac37605924d43fdf8110133399885a92bd05e 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -110,8 +110,8 @@ override CFLAGS += -DPOSTGIS_SCRIPTS_VERSION='"$(SCRIPTS_VERSION)"'
 
 ifeq ($(USE_GEOS),1)
        override CFLAGS += -I$(GEOS_DIR)/include -DUSE_GEOS
-       GEOS_RULES=detect_geos_version
-       GEOS_WRAPPER=lwgeom_geos_wrapper.o
+       #GEOS_RULES=detect_geos_version
+       GEOS_WRAPPER=../postgis_geos_wrapper.o
 endif
 
 ifeq ($(USE_PROJ),1)
@@ -177,9 +177,6 @@ all: all-lib lwpostgis.sql
 lwpostgis.sql: lwpostgis.sql.in
        cpp -P -traditional-cpp -DUSE_VERSION=$(USE_VERSION) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g' > $@
 
-detect_geos_version: 
-       ./geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
-
 install: all installdirs install-lwgeom-lib
        #$(INSTALL_DATA) lwgeom.sql $(DESTDIR)$(datadir)
        $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)