[postgis-tickets] r15051 - pgcommon/Makefile.in orders CFLAGS incorrectly leading to wrong liblwgeom.h

[Regina Obe]

Author: robe
Date: 2016-09-02 14:23:36 -0700 (Fri, 02 Sep 2016)
New Revision: 15051

Modified:
   trunk/NEWS
   trunk/libpgcommon/Makefile.in
   trunk/postgis/Makefile.in
   trunk/raster/rt_core/Makefile.in
   trunk/raster/rt_pg/Makefile.in
Log:
pgcommon/Makefile.in orders CFLAGS incorrectly leading to wrong liblwgeom.h 
Patch from Greg Troxel
Closes #3604

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2016-08-31 11:36:46 UTC (rev 15050)
+++ trunk/NEWS	2016-09-02 21:23:36 UTC (rev 15051)
@@ -6,6 +6,10 @@
   - #3466, Casting from box3d to geometry now returns a 3D
            geometry (Julien Rouhaud of Dalibo)
 
+  - #3604, pgcommon/Makefile.in orders 
+	       CFLAGS incorrectly leading to wrong liblwgeom.h
+		   (Greg Troxel)
+
  * Deprecated signatures *
 
  * New Features *

Modified: trunk/libpgcommon/Makefile.in
===================================================================
--- trunk/libpgcommon/Makefile.in	2016-08-31 11:36:46 UTC (rev 15050)
+++ trunk/libpgcommon/Makefile.in	2016-09-02 21:23:36 UTC (rev 15051)
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 CC=@CC@
-CFLAGS=@CFLAGS@ -I../liblwgeom @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GETTEXT_CFLAGS@
+CFLAGS=-I../liblwgeom @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GETTEXT_CFLAGS@
 LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
 
 NUMERICFLAGS=@NUMERICFLAGS@

Modified: trunk/postgis/Makefile.in
===================================================================
--- trunk/postgis/Makefile.in	2016-08-31 11:36:46 UTC (rev 15050)
+++ trunk/postgis/Makefile.in	2016-09-02 21:23:36 UTC (rev 15051)
@@ -108,7 +108,8 @@
 # to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
 # older version of PostGIS, rather than with the static liblwgeom.a
 # supplied with newer versions of PostGIS
-PG_CPPFLAGS += -I../liblwgeom -I../libpgcommon @CPPFLAGS@ -fPIC
+override CFLAGS := -I../liblwgeom $(CFLAGS)
+PG_CPPFLAGS += -I../libpgcommon @CPPFLAGS@ -fPIC
 SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
 
 # Add SFCGAL Flags if defined

Modified: trunk/raster/rt_core/Makefile.in
===================================================================
--- trunk/raster/rt_core/Makefile.in	2016-08-31 11:36:46 UTC (rev 15050)
+++ trunk/raster/rt_core/Makefile.in	2016-09-02 21:23:36 UTC (rev 15051)
@@ -28,7 +28,7 @@
 GEOS_LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c
 PROJ_LDFLAGS = @PROJ_LDFLAGS@ -lproj
 LDFLAGS = $(LIBLWGEOM_LDFLAGS) $(LIBGDAL_LDFLAGS) $(PROJ_LDFLAGS) $(GEOS_LDFLAGS)
-CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ $(LIBLWGEOM_CFLAGS) $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
+CFLAGS = $(LIBLWGEOM_CFLAGS) @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
 
 # Standalone RTCORE objects
 RT_OBJS = \

Modified: trunk/raster/rt_pg/Makefile.in
===================================================================
--- trunk/raster/rt_pg/Makefile.in	2016-08-31 11:36:46 UTC (rev 15050)
+++ trunk/raster/rt_pg/Makefile.in	2016-09-02 21:23:36 UTC (rev 15051)
@@ -65,7 +65,8 @@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@
 
-PG_CPPFLAGS+=@CPPFLAGS@ $(LIBLWGEOM_CFLAGS) $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
+override CFLAGS := $(LIBLWGEOM_CFLAGS) $(CFLAGS)
+PG_CPPFLAGS+= @CPPFLAGS@ $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
 SHLIB_LINK_F = ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS) $(LIBGDAL_LDFLAGS) @SHLIB_LINK@ 
 
 # Extra files to remove during 'make clean'