[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-311-gf14b79bb4

[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  f14b79bb42c7f8edf24c4e8c5a84a64e2f11bf08 (commit)
      from  dd4ab0d780092be3e5c31172f54afeff96255b37 (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 f14b79bb42c7f8edf24c4e8c5a84a64e2f11bf08
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 20 13:32:03 2022 +0100

    Fix out-of-tree build of raster
    
    References #5060

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index a07562188..b5d2e6709 100644
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -22,6 +22,7 @@
 
 top_builddir = @top_builddir@
 builddir = @builddir@
+top_srcdir = @top_srcdir@
 srcdir = @srcdir@
 
 VPATH = $(srcdir)
@@ -38,7 +39,7 @@ RASTER2PGSQL=raster2pgsql at EXESUFFIX@
 PGSQL_BINDIR=@PGSQL_BINDIR@
 
 LIBLWGEOM_LDFLAGS = -static $(top_builddir)/liblwgeom/liblwgeom.la
-LIBLWGEOM_CFLAGS = -I$(top_builddir)/liblwgeom
+LIBLWGEOM_CFLAGS = -I$(top_builddir)/liblwgeom -I$(top_srcdir)/liblwgeom
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBGDAL_DEPLIBS_LDFLAGS=@LIBGDAL_DEPLIBS_LDFLAGS@
@@ -46,7 +47,7 @@ PROJ_CFLAGS=@PROJ_CPPFLAGS@
 GEOS_CFLAGS=@GEOS_CPPFLAGS@
 GEOS_LDFLAGS=@GEOS_LDFLAGS@
 
-RTCORE_CFLAGS = -I$(srcdir)/../rt_core
+RTCORE_CFLAGS = -I$(srcdir)/../rt_core -I$(builddir)/.. -I$(builddir) -I$(top_builddir)
 RTCORE_LDFLAGS = $(builddir)/../rt_core/librtcore.a
 
 # GetText includes and libraries
diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
index 711677bc9..385ff9b26 100644
--- a/raster/rt_core/Makefile.in
+++ b/raster/rt_core/Makefile.in
@@ -27,7 +27,7 @@ AR = ar rs
 
 CC = @CC@
 LIBLWGEOM_LDFLAGS = $(top_builddir)/liblwgeom/.libs/liblwgeom.a
-LIBLWGEOM_CFLAGS = -I$(top_srcdir)/liblwgeom -I$(top_builddir)/liblwgeom -I$(builddir)
+LIBLWGEOM_CFLAGS = -I$(top_srcdir)/liblwgeom -I$(top_builddir)/liblwgeom -I$(top_builddir) -I$(top_builddir)/raster -I$(builddir)
 LIBGDAL_CFLAGS = @LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS = @LIBGDAL_LDFLAGS@
 GEOS_LDFLAGS = @GEOS_LDFLAGS@
diff --git a/raster/rt_core/librtcore.h b/raster/rt_core/librtcore.h
index 3d813d24f..7014e4f53 100644
--- a/raster/rt_core/librtcore.h
+++ b/raster/rt_core/librtcore.h
@@ -134,8 +134,8 @@
 #include "ogr_api.h"
 #include "ogr_srs_api.h"
 
-#include "../../postgis_config.h"
-#include "../raster_config.h"
+#include "postgis_config.h"
+#include "raster_config.h"
 
 #ifndef __GNUC__
 # define __attribute__ (x)
diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index c4ba032a6..be8805c45 100644
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -75,7 +75,17 @@ LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@
 
 CC = @CC@
-PG_CPPFLAGS+= $(LIBLWGEOM_CFLAGS) @CPPFLAGS@ @CFLAGS@ $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I at srcdir@/../rt_core
+PG_CPPFLAGS += \
+	$(LIBLWGEOM_CFLAGS) \
+	@CPPFLAGS@ \
+	@CFLAGS@ \
+	$(LIBGDAL_CFLAGS) \
+	$(LIBPGCOMMON_CFLAGS) \
+	$(LIBPROJ_CFLAGS) \
+	-I at srcdir@/../rt_core \
+	-I at builddir@ \
+	-I at builddir@/.. \
+	-I at top_builddir@
 SHLIB_LINK_F = @builddir@/../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS) $(LIBGDAL_LDFLAGS) @SHLIB_LINK@
 
 # Extra files to remove during 'make clean'

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

Summary of changes:
 raster/loader/Makefile.in  |  5 +++--
 raster/rt_core/Makefile.in |  2 +-
 raster/rt_core/librtcore.h |  4 ++--
 raster/rt_pg/Makefile.in   | 12 +++++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
PostGIS