[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-575-gbfaab7641

[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  bfaab7641d9591bcc21e436d012fd2e79f9d25d7 (commit)
      from  644797a9ea72e4db0c8768b96fe1affd97252baf (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 bfaab7641d9591bcc21e436d012fd2e79f9d25d7
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Sep 17 09:41:07 2023 +0200

    Check for xml checking validation deps at configure time
    
    References #5536 #5542

diff --git a/configure.ac b/configure.ac
index 7f82a6cc8..9b8922a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,6 +361,32 @@ fi
 
 AC_SUBST([XSLBASE])
 
+dnl
+dnl Ensure DocBook RelaxNG can be found
+dnl
+DOCBOOK5_RNG=http://docbook.org/xml/5.0/rng/docbook.rng
+if test "x$XMLCATALOG" = "x"; then
+  DOCBOOK5_RNG=
+else
+  if $XMLCATALOG '' "${DOCBOOK5_RNG}" > /dev/null; then :
+  else DOCBOOK5_RNG=
+  fi
+fi
+AC_SUBST([DOCBOOK5_RNG])
+
+dnl
+dnl Ensure DocBook DTD can be found
+dnl
+DOCBOOK5_DTD=http://docbook.org/xml/5.0/rng/docbook.dtd
+if test "x$XMLCATALOG" = "x"; then
+  DOCBOOK5_DTD=
+else
+  if $XMLCATALOG '' "${DOCBOOK5_DTD}" > /dev/null; then :
+  else DOCBOOK5_DTD=
+  fi
+fi
+AC_SUBST([DOCBOOK5_DTD])
+
 dnl ===========================================================================
 dnl Detect if pkg-config installed
 dnl ===========================================================================
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b5becf14e..51cc5ac1a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -62,6 +62,8 @@ INSTALL_DATA=@INSTALL_DATA@
 XMLCATALOG=@XMLCATALOG@
 XSLTPROC=@XSLTPROC@
 XSLBASE=@XSLBASE@
+DOCBOOK5_RNG=@DOCBOOK5_RNG@
+DOCBOOK5_DTD=@DOCBOOK5_DTD@
 CAN_UPDATE_TRANSLATIONS=@CAN_UPDATE_TRANSLATIONS@
 XMLLINT=@XMLLINT@
 CAN_BUILD_COMMENTS=@CAN_BUILD_COMMENTS@
@@ -274,6 +276,14 @@ check-xml: requirements_not_met_xmlcatalog
 CAN_CHECK_XML = no
 endif
 
+ifeq ($(DOCBOOK5_RNG),)
+CAN_CHECK_XML = no
+endif
+
+ifeq ($(DOCBOOK5_DTD),)
+CAN_CHECK_XML = no
+endif
+
 ifeq ($(MSGMERGE),)
 $(PO_FILES): requirements_not_met_msgmerge
 endif
@@ -630,15 +640,11 @@ check-regress:
 check-unit: $(CHECK_UNIT_TARGET)
 
 check-xml: postgis-out.xml
-	# Fail early if cannot find required RelaxNG
-	$(XMLCATALOG) "" "http://docbook.org/xml/5.0/rng/docbook.rng"
-	# Fail early if cannot find required DTD
-	$(XMLCATALOG) "" "http://docbook.org/xml/5.0/dtd/docbook.dtd"
 	# TODO: --schematron http://docbook.org/xml/5.0/sch/docbook.sch
 	# See https://trac.osgeo.org/postgis/ticket/5532
 	$(XMLLINT) --noout --nonet \
 		--valid --loaddtd \
-		--relaxng http://docbook.org/xml/5.0/rng/docbook.rng \
+		--relaxng $(DOCBOOK5_RNG) \
 		$<
 
 check-cheatsheets: cheatsheets

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

Summary of changes:
 configure.ac    | 26 ++++++++++++++++++++++++++
 doc/Makefile.in | 16 +++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS