Switch liblwgeom to use the POSTGIS_* defines already generated by configure, rather...

Similar to my previous commit, however here the aim is that by moving the logic outside of make then we can
potentially allow other generators (such as CMake) to detect and use other compilers rather than embedding
specific -D flags into the command line.

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

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 1e0f16ff8ca41dfd369ab7788e1eec6a38dbf217..e7a52a1c2e5e5c088da0de795d2c00d5958647a7 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -11,9 +11,7 @@
 # **********************************************************************
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ \
-         @GEOS_CPPFLAGS@ -DPOSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@ \
-         @PROJ_CPPFLAGS@ -DPOSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@
+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@
 LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj
 NUMERICFLAGS = @NUMERICFLAGS@
 top_builddir = @top_builddir@

diff --git a/liblwgeom/liblwgeom_internal.h b/liblwgeom/liblwgeom_internal.h
index 8e00dbc84821d5540bc672853452505c26cf73da..f128f93ae75c1c2f78e90773af79b1d3c2f70e07 100644 (file)
--- a/liblwgeom/liblwgeom_internal.h
+++ b/liblwgeom/liblwgeom_internal.h
@@ -16,6 +16,8 @@
 #ifndef _LIBLWGEOM_INTERNAL_H
 #define _LIBLWGEOM_INTERNAL_H 1
 
+#include "../postgis_config.h"
+
 #include <assert.h>
 #include <stdarg.h>
 #include <stdint.h>