[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-553-g34ee46ef1

[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  34ee46ef1532ab53b090fc7f6d73ac0d73703923 (commit)
      from  0041dedc12d7cfcaf5d0bdfb1d0e37b20a218cfc (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 34ee46ef1532ab53b090fc7f6d73ac0d73703923
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Sep 14 23:10:33 2023 +0200

    Encode new requirement on xmlcatalog

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 18a224282..27c615289 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -330,6 +330,8 @@ postgis-out.xml: postgis.xml Makefile $(XML_INPUTS) Makefile
 ifeq ($(XMLLINT),)
 postgis-nospecial.xml: requirements_not_met_xmllint
 postgis-out.xml: requirements_not_met_xmllint
+check-xml: requirements_not_met_xmllint
+check-cheatsheets: requirements_not_met_xmllint
 endif
 
 chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css
@@ -583,10 +585,10 @@ check-regress:
 
 check-unit: check-xml
 
-ifeq ($(XMLLINT),)
-check-xml: requirements_not_met_xmllint
-check-cheatsheets: requirements_not_met_xmllint
-else
+ifeq ($(XMLCATALOG),)
+check-xml: requirements_not_met_xmlcatalog
+endif
+
 check-xml: postgis-out.xml
 	# Fail early if cannot find required RelaxNG
 	$(XMLCATALOG) "" "http://docbook.org/xml/5.0/rng/docbook.rng"
@@ -599,15 +601,11 @@ check-xml: postgis-out.xml
 		--relaxng http://docbook.org/xml/5.0/rng/docbook.rng \
 		$<
 
-
 check-cheatsheets: cheatsheets
 	for f in $(html_builddir)/*_cheatsheet-en.html; do \
 		$(abs_top_srcdir)/utils/check_localized_cheatsheets.sh $${f} en $(patsubst -%,%,$(DOCSUFFIX)) || exit 1; \
 	done
 
-endif
-
-
 requirements_not_met_xsltproc:
 	@echo
 	@echo "configure was unable to find 'xsltproc' which is required"
@@ -627,6 +625,15 @@ requirements_not_met_xmllint:
 	@echo
 	@false
 
+requirements_not_met_xmlcatalog:
+	@echo
+	@echo "configure was unable to find 'xmlcatalog' which is required"
+	@echo "to check the postgis documentation."
+	@echo "Install xmlcatalog and then re-run configure."
+	@echo
+	@false
+
+
 requirements_not_met_xslbase:
 	@echo
 	@echo "configure was unable to find the Docbook XSL stylesheet directory"

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

Summary of changes:
 doc/Makefile.in | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS