[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-574-g644797a9e

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

    Do not check documentation on `make check` if deps are not met
    
    References #5536 #5542

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9a59bc361..b5becf14e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -149,6 +149,7 @@ ifeq ($(CAN_BUILD_EPUB),yes)
 BUILD_TARGET += epub
 endif
 
+
 # TODO: add "html" to the BUILD_TARGET if it can be built
 
 all: $(BUILD_TARGET)
@@ -257,6 +258,22 @@ GENERATED_CHEATSHEET_FILES = $(patsubst \
 
 VPATH = $(srcdir)
 
+
+CAN_CHECK_XML = yes
+
+ifeq ($(XMLLINT),)
+postgis-nospecial.xml: requirements_not_met_xmllint
+postgis-out.xml: requirements_not_met_xmllint
+check-cheatsheets: requirements_not_met_xmllint
+check-xml: requirements_not_met_xmllint
+CAN_CHECK_XML = no
+endif
+
+ifeq ($(XMLCATALOG),)
+check-xml: requirements_not_met_xmlcatalog
+CAN_CHECK_XML = no
+endif
+
 ifeq ($(MSGMERGE),)
 $(PO_FILES): requirements_not_met_msgmerge
 endif
@@ -282,6 +299,13 @@ ifeq ($(XML2POT),)
 $(XML_SOURCE_POTS): requirements_not_met_xml2pot
 endif
 
+CHECK_UNIT_TARGET =
+
+ifeq ($(CAN_CHECK_XML),yes)
+CHECK_UNIT_TARGET = check-xml
+endif
+
+
 $(XML_SOURCE_POTS): %.xml.pot: %.xml
 	$(XML2POT) $< > $@
 	$(abs_srcdir)/po/strip_untranslatable.sh $@
@@ -354,13 +378,6 @@ postgis-out.xml: postgis.xml Makefile $(XML_INPUTS) Makefile
 	$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@.in
 	$(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
 
-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
 $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
@@ -610,11 +627,7 @@ endif
 check: check-unit
 check-regress:
 
-check-unit: check-xml
-
-ifeq ($(XMLCATALOG),)
-check-xml: requirements_not_met_xmlcatalog
-endif
+check-unit: $(CHECK_UNIT_TARGET)
 
 check-xml: postgis-out.xml
 	# Fail early if cannot find required RelaxNG

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

Summary of changes:
 doc/Makefile.in | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
PostGIS