[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-581-g4f79c38c4

[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  4f79c38c41e6b660e053670149fe0875a31c9f64 (commit)
      from  a980403f8242bc6f0e0ed35af04d9d2cf0d01328 (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 4f79c38c41e6b660e053670149fe0875a31c9f64
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Sep 18 22:40:22 2023 +0200

    Tweak configure check of depednencies
    
    - Don't disable extensions if comments cannot be built
    - Don't disable building comments if (unneeded) xmlcatalog isn't found
    - Reword warning about missing xml2pot
    - Reword warning about missing XSL for html documentation

diff --git a/configure.ac b/configure.ac
index 9b8922a8f..2a08a0c6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,8 +207,7 @@ fi
 
 AC_PATH_PROG([XMLCATALOG], [xmlcatalog], [])
 if test "x$XMLCATALOG" = "x"; then
-	AC_MSG_WARN([xmlcatalog is not installed so documentation cannot be built])
-	CAN_BUILD_COMMENTS=no
+	AC_MSG_WARN([xmlcatalog is not installed so documentation cannot be checked])
 fi
 
 AC_PATH_PROG([XMLLINT], [xmllint], [])
@@ -222,7 +221,7 @@ fi
 
 AC_PATH_PROG([XML2POT], [xml2pot], [])
 if test "x$XML2POT" = "x"; then
-	AC_MSG_WARN([xml2pot is not installed so translations cannot be updated])
+	AC_MSG_WARN([xml2pot is not installed so translation template cannot be updated])
 fi
 
 AC_PATH_PROG([MSGMERGE], [msgmerge], [])
@@ -331,7 +330,7 @@ if test "x$XSLBASE" = "x"; then
 	dnl Check to see if the automatically searched paths above located a
 	dnl valid Docbook stylesheet
 	if test "x$XSLBASE_AUTO" = "x"; then
-		AC_MSG_WARN([could not locate Docbook stylesheets required to build the documentation])
+		AC_MSG_WARN([could not locate Docbook stylesheets required to build the html documentation])
 	fi
 else
 	dnl The user specified an alternate directory so make sure everything
@@ -1772,20 +1771,14 @@ DEPS_MAKEFILE_LIST="$DEPS_MAKEFILE_LIST
 
 dnl ===========================================================================
 dnl See if we have the requirements for building the extensions, namely
-dnl the xlstproc tool for generating the comments SQL file.
+dnl the pg_config support
 dnl ===========================================================================
 
 EXTENSIONS=""
 if test "x$PG_CONFIG" != "xno"; then
-  if test \
-          -e doc/postgis_comments.sql -a \
-          -e doc/raster_comments.sql -o \
-          "$CAN_BUILD_COMMENTS" = "yes"
-  then
-      AC_MSG_RESULT([enabling PostgreSQL extension support...])
-      EXTENSIONS=extensions
-      AC_SUBST([EXTENSIONS])
-  fi
+    AC_MSG_RESULT([enabling PostgreSQL extension support...])
+    EXTENSIONS=extensions
+    AC_SUBST([EXTENSIONS])
 fi
 
 INSTALL_EXTENSION_UPGRADES=yes

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

Summary of changes:
 configure.ac | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
PostGIS