[SCM] PostGIS branch master updated. 3.4.0rc1-760-gc209e806e

[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  c209e806eacfe53a71696f4ee84f19256f3d77da (commit)
      from  0f4ce41779f4bda70c02fb1a547bf3dc8c12a8ea (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 c209e806eacfe53a71696f4ee84f19256f3d77da
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Nov 13 12:53:14 2023 +0100

    Use better named vars for PostgreSQL build support

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 579b7553d..d8c28b937 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -5,7 +5,7 @@
 #-----------------------------------------------------
 
 SUBDIRS = liblwgeom @RASTER@ loader
-ifeq (@LIBLWGEOM_ONLY@,no)
+ifeq (@SUPPORT_POSTGRESQL@,yes)
 SUBDIRS += @DEPS_SUBDIR@ libpgcommon postgis regress @TOPOLOGY@ @SFCGAL@ utils doc @EXTENSIONS@
 endif
 
@@ -55,7 +55,7 @@ endif
 
 all: postgis_revision.h
 
-ifeq (@LIBLWGEOM_ONLY@,no)
+ifeq (@SUPPORT_POSTGRESQL@,yes)
 ifeq ($(CAN_BUILD_COMMENTS),yes)
 install: comments-install
 uninstall: comments-uninstall
@@ -71,7 +71,7 @@ test: check
 
 check: check-unit docs-check check-lint
 
-ifeq (@LIBLWGEOM_ONLY@,no)
+ifeq (@SUPPORT_POSTGRESQL@,yes)
 check: check-regress
 endif
 
diff --git a/configure.ac b/configure.ac
index cd136395f..62efadb95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,9 @@ dnl **********************************************************************
 dnl *
 dnl * PostGIS - Spatial Types for PostgreSQL
 dnl * http://postgis.net
-dnl * Copyright 2008 Mark Cave-Ayland
+dnl *
+dnl * Copyright (C) 2010-2023 Sandro Santilli <strk at kbt.io>
+dnl * Copyright (C) 2008 Mark Cave-Ayland
 dnl *
 dnl * This is free software; you can redistribute and/or modify it under
 dnl * the terms of the GNU General Public Licence. See the COPYING file.
@@ -487,20 +489,20 @@ fi
 AC_SUBST([ICONV_LDFLAGS])
 AC_SUBST([ICONV_CFLAGS])
 
-LIBLWGEOM_ONLY="no"
-AC_SUBST([LIBLWGEOM_ONLY])
-
 dnl ===========================================================================
 dnl Detect the version of PostgreSQL installed on the system, if needed
 dnl ===========================================================================
 
+SUPPORT_POSTGRESQL=yes
+AC_SUBST([SUPPORT_POSTGRESQL])
+
 AC_ARG_VAR(PG_CONFIG, [PostgreSQL configure command to determine Postgres version to build against.])
 AC_ARG_WITH([pgconfig],
 	[AS_HELP_STRING([--with-pgconfig=FILE], [specify an alternative pg_config file or disable postgresql (--without-pgconfig)])],
 	[PG_CONFIG="$withval"], [])
 
 if test "x$PG_CONFIG" = "xno"; then
-	LIBLWGEOM_ONLY="yes"
+	SUPPORT_POSTGRESQL="no"
 	AC_MSG_RESULT([PostgreSQL support disabled])
 
 elif test "x$PG_CONFIG" = "x"; then
@@ -524,7 +526,7 @@ else
 	fi
 fi
 
-if test "x$LIBLWGEOM_ONLY" = "xno"; then
+if test "x$SUPPORT_POSTGRESQL" = "xyes"; then dnl {
 
   dnl ===========================================================================
   dnl Ensure that $PG_CONFIG --pgxs points to a valid file. This is because some
@@ -643,7 +645,7 @@ if test "x$LIBLWGEOM_ONLY" = "xno"; then
   AC_SUBST([POSTGIS_PGSQL_HR_VERSION])
   AC_SUBST([HAVE_SPGIST])
 
-fi dnl LIBLWGEOM_ONLY != no
+fi dnl } SUPPORT_POSTGRESQL = yes
 
 
 dnl ===========================================================================
@@ -1909,7 +1911,7 @@ if test "x$SFCGAL" = "xsfcgal"; then
     AC_MSG_RESULT([  SFCGAL config:        ${SFCGAL_CONFIG}])
     AC_MSG_RESULT([  SFCGAL version:       ${SFCGAL_VERSION}])
 fi
-if test "x$LIBLWGEOM_ONLY" = "xno"; then
+if test "x$SUPPORT_POSTGRESQL" = "xyes"; then
   AC_MSG_RESULT([  PostgreSQL config:    ${PG_CONFIG}])
   AC_MSG_RESULT([  PostgreSQL version:   ${PGSQL_FULL_VERSION}])
 else

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

Summary of changes:
 GNUmakefile.in |  6 +++---
 configure.ac   | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS