[postgis-tickets] [SCM] PostGIS branch master updated. 3e077082968f3fa4a95e0050b16f1074f4144142

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  3e077082968f3fa4a95e0050b16f1074f4144142 (commit)
      from  fa7aaf09a40b18e9ac508206e5fa2cb3ebf8fd2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e077082968f3fa4a95e0050b16f1074f4144142
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Nov 29 15:58:52 2019 +0100

    Add missing CPPFLAGS in multiple Makefiles
    
    Closes #4592

diff --git a/NEWS b/NEWS
index 1e2b797..72a22b0 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ PostGIS 3.1.0
   - #4558, Fix oversimplification of polygon inner rings (Raúl Marín)
   - #4588, Fix update when st_union(geometry) doesn't exist (Raúl Marín)
   - #4590, Fix pg_upgrade issue with st_linecrossingdirection (Raúl Marín)
+  - #4592, Add missing CPPFLAGS in multiple Makefiles (Raúl Marín)
 
 
 PostGIS 3.0.0
diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index ecd55e2..39fffa0 100644
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 CC=@CC@
-CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
+CFLAGS= -I../liblwgeom @CPPFLAGS@ @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
 LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
 
 NUMERICFLAGS=@NUMERICFLAGS@
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 7e421ba..40b1c17 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -22,7 +22,7 @@ include $(PGXS)
 # Set CFLAGS afer PGXS, otherwise it will get overwritten with the PGXS
 # version which is not what we want.
 CC=@CC@
-CFLAGS=-I ../liblwgeom @WARNFLAGS@ @CFLAGS@ @PICFLAGS@ @PROJ_CPPFLAGS@
+CFLAGS= -I ../liblwgeom @CPPFLAGS@ @WARNFLAGS@ @CFLAGS@ @PICFLAGS@ @PROJ_CPPFLAGS@
 top_builddir = @top_builddir@
 SHELL = @SHELL@
 INSTALL = @INSTALL@
diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index f6f36b5..5c5e983 100644
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -16,7 +16,7 @@ SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
+CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I.. @CPPFLAGS@
 
 # GTK includes and libraries
 GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
index 232bcb9..fb96470 100644
--- a/raster/rt_core/Makefile.in
+++ b/raster/rt_core/Makefile.in
@@ -28,7 +28,7 @@ LIBGDAL_LDFLAGS = @LIBGDAL_LDFLAGS@
 GEOS_LDFLAGS = @GEOS_LDFLAGS@
 PROJ_LDFLAGS = @PROJ_LDFLAGS@
 LDFLAGS = $(LIBLWGEOM_LDFLAGS) $(LIBGDAL_LDFLAGS) $(PROJ_LDFLAGS) $(GEOS_LDFLAGS)
-CFLAGS = $(LIBLWGEOM_CFLAGS) @WARNFLAGS@ @CFLAGS@ @PICFLAGS@ $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
+CFLAGS = $(LIBLWGEOM_CFLAGS) @CPPFLAGS@ @WARNFLAGS@ @CFLAGS@ @PICFLAGS@ $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
 
 # Standalone RTCORE objects
 RT_OBJS = \
diff --git a/raster/test/cunit/Makefile.in b/raster/test/cunit/Makefile.in
index c28f5c0..fead5c6 100644
--- a/raster/test/cunit/Makefile.in
+++ b/raster/test/cunit/Makefile.in
@@ -45,7 +45,7 @@ LDFLAGS = \
 	$(PROJ_LDFLAGS)
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
+CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ @CPPFLAGS@ -I..
 
 # ADD YOUR NEW TEST FILE HERE (1/1)
 OBJS=	\

-----------------------------------------------------------------------

Summary of changes:
 NEWS                          | 1 +
 libpgcommon/Makefile.in       | 2 +-
 loader/Makefile.in            | 2 +-
 loader/cunit/Makefile.in      | 2 +-
 raster/rt_core/Makefile.in    | 2 +-
 raster/test/cunit/Makefile.in | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS