From: Mark Cave-Ayland Date: Sat, 14 Jan 2012 00:49:21 +0000 (+0000) Subject: Switch liblwgeom to use the POSTGIS_* defines already generated by configure, rather... X-Git-Tag: 2.0.0alpha1~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb5749edae43070b8252334669a7ae7397939be1;p=postgis Switch liblwgeom to use the POSTGIS_* defines already generated by configure, rather than passing them in directly. 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 1e0f16ff8..e7a52a1c2 100644 --- 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 8e00dbc84..f128f93ae 100644 --- 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 #include #include