[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-573-g2739e487f

[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  2739e487f7db1d344afe9f106c9f897264370de0 (commit)
      from  ea76f5eabe77a5bd494ca8d8022316a2d15d462a (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 2739e487f7db1d344afe9f106c9f897264370de0
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Sep 17 08:35:07 2023 +0200

    Disable extensions if comments cannot be built due to missing xmllint
    
    References #5542

diff --git a/configure.ac b/configure.ac
index 0fd6d5d6b..7f82a6cc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,15 @@ if test "x$XMLCATALOG" = "x"; then
 	CAN_BUILD_COMMENTS=no
 fi
 
+AC_PATH_PROG([XMLLINT], [xmllint], [])
+if test "x$XMLLINT" = "x"; then
+	dnl AC_MSG_WARN([xmllint is not installed so documentation cannot be checked])
+	AC_MSG_WARN([xmlcatalog is not installed so documentation cannot be built])
+	CAN_BUILD_COMMENTS=no
+fi
+
+
+
 AC_PATH_PROG([XML2POT], [xml2pot], [])
 if test "x$XML2POT" = "x"; then
 	AC_MSG_WARN([xml2pot is not installed so translations cannot be updated])
@@ -266,12 +275,6 @@ if test "x$DBTOEPUB" = "x"; then
 fi
 AC_SUBST(CAN_BUILD_EPUB)
 
-AC_PATH_PROG([XMLLINT], [xmllint], [])
-if test "x$XMLLINT" = "x"; then
-	AC_MSG_WARN([xmllint is not installed so documentation cannot be checked])
-fi
-
-
 dnl
 dnl Allow the user to specify the location of the html/docbook.xsl stylesheet
 dnl
@@ -1749,9 +1752,9 @@ dnl ===========================================================================
 EXTENSIONS=""
 if test "x$PG_CONFIG" != "xno"; then
   if test \
-          "x$XSLTPROC" != "x" -o \
           -e doc/postgis_comments.sql -a \
-          -e doc/raster_comments.sql;
+          -e doc/raster_comments.sql -o \
+          "$CAN_BUILD_COMMENTS" = "yes"
   then
       AC_MSG_RESULT([enabling PostgreSQL extension support...])
       EXTENSIONS=extensions

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

Summary of changes:
 configure.ac | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS