From 979fe69c7e749a9a964b72a7ad7c431a2e8ccc97 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 16 Jun 2004 18:47:59 +0000
Subject: [PATCH] Added code to detect geos version. Added appropriate includes
 in geos connectors.

git-svn-id: http://svn.osgeo.org/postgis/trunk@628 b70326c6-7e19-0410-871a-916f4a2858ee
---
 Makefile                 | 5 ++++-
 postgis_geos.c           | 6 +++++-
 postgis_geos_wrapper.cpp | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5e1db5812..d6efe723b 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ include $(top_srcdir)/src/Makefile.shlib
 
 postgis_geos_wrapper.o: postgis_geos_wrapper.cpp
 
-all: all-lib postgis.sql postgis_undef.sql loaderdumper
+all: postgis_geos_version.h all-lib postgis.sql postgis_undef.sql loaderdumper
 
 loaderdumper:
 	$(MAKE) -C loader
@@ -209,6 +209,9 @@ endif
 endif # not win
 #----------------------------------------------------------
 
+postgis_geos_version.h:
+	./geos_version.sh $(GEOS_DIR) > $@
+
 installdirs:
 	$(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)
 
diff --git a/postgis_geos.c b/postgis_geos.c
index 023ced995..282784118 100644
--- a/postgis_geos.c
+++ b/postgis_geos.c
@@ -10,6 +10,10 @@
  *
  **********************************************************************
  * $Log$
+ * Revision 1.29  2004/06/16 18:47:59  strk
+ * Added code to detect geos version.
+ * Added appropriate includes in geos connectors.
+ *
  * Revision 1.28  2004/04/28 22:26:02  pramsey
  * Fixed spelling mistake in header text.
  *
@@ -135,7 +139,7 @@
 #include "access/rtree.h"
 
 #include "utils/builtins.h"
-
+#include "postgis_geos_version.h"
 
  /*
   * Define this to have have many notices printed
diff --git a/postgis_geos_wrapper.cpp b/postgis_geos_wrapper.cpp
index 07369d643..94c590467 100644
--- a/postgis_geos_wrapper.cpp
+++ b/postgis_geos_wrapper.cpp
@@ -2,6 +2,10 @@
 
 /*
 * $Log$
+* Revision 1.19  2004/06/16 18:47:59  strk
+* Added code to detect geos version.
+* Added appropriate includes in geos connectors.
+*
 * Revision 1.18  2004/04/27 07:44:26  strk
 * Removed use of geometryFactory->toGeometry(), indicated by Martin Davis
 * as being intended for internal use only. Created a linear ring instead
@@ -48,6 +52,7 @@
 
 #include "geom.h"
 #include "util.h"
+#include "postgis_geos_version.h"
 
 using namespace geos;
 
-- 
2.40.0