[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-517-gb6583e983

[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  b6583e98323ffe1a8438b51f3a9c70205fdbcf6b (commit)
      from  ca33aa7cbce3b25eb7fdaa42b93b9e5a280525f9 (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 b6583e98323ffe1a8438b51f3a9c70205fdbcf6b
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Sep 13 14:11:10 2023 +0200

    Rely on system's xmlcatalog to find docbook XSL

diff --git a/configure.ac b/configure.ac
index 8cf852e2b..4642485ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,71 +255,6 @@ 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
-
-AC_ARG_WITH([xsldir],
-	[AS_HELP_STRING([--with-xsldir=PATH], [specify the directory containing the docbook.xsl stylesheet])],
-	[XSLBASE="$withval"], [XSLBASE=""])
-
-XSLBASE_AUTO=""
-if test "x$XSLBASE" = "x"; then
-	dnl If the user did not specify a directory for the docbook
-	dnl stylesheet, choose the first directory
-	dnl that matches from the following list
-	SEARCHPATH="
-		/usr/share/sgml/docbook/xsl-stylesheets
-		/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
-		/usr/share/xml/docbook/stylesheet/docbook-xsl
-		/usr/share/xml/docbook/stylesheet/nwalsh
-		/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-		/opt/local/share/xsl/docbook-xsl
-		/usr/local/opt/docbook-xsl/docbook-xsl
-		/usr/local/share/xsl/docbook-xsl
-		/usr/share/xsl/docbook-xsl
-		"
-	for p in ${SEARCHPATH}; do
-		if test -r "${p}"/html/docbook.xsl; then
-			XSLBASE_AUTO="${p}"
-			break
-		fi
-	done
-
-	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])
-	fi
-else
-	dnl The user specified an alternate directory so make sure everything
-	dnl looks sensible
-	if test ! -d "$XSLBASE"; then
-		AC_MSG_ERROR([the docbook stylesheet directory specified using --with-xsldir does not exist])
-	fi
-
-	if test ! -f "$XSLBASE/html/docbook.xsl"; then
-		AC_MSG_ERROR([the docbook stylesheet directory specified using --with-xsldir does not contain the html/docbook.xsl file])
-	fi
-fi
-
-dnl
-dnl If XSLBASE has been set then at this point we know it must be
-dnl valid and so we can just use it. If XSLBASE_AUTO has been set, and XSLBASE
-dnl is empty then a valid stylesheet was found in XSLBASE_AUTO so we
-dnl should use that. Otherwise just continue silently with a blank XSLBASE
-dnl variable which will trigger the error message in the documentation Makefile
-dnl
-
-if test "x$XSLBASE" = "x"; then
-	if test ! "x$XSLBASE_AUTO" = "x"; then
-		XSLBASE="$XSLBASE_AUTO"
-	fi
-fi
-
-AC_SUBST([XSLBASE])
-
 dnl ===========================================================================
 dnl Detect if pkg-config installed
 dnl ===========================================================================
@@ -1871,7 +1806,6 @@ fi
 AC_MSG_RESULT()
 AC_MSG_RESULT([ -------- Documentation Generation -------- ])
 AC_MSG_RESULT([  xsltproc:             ${XSLTPROC}])
-AC_MSG_RESULT([  xsl style sheets:     ${XSLBASE}])
 AC_MSG_RESULT([  dblatex:              ${DBLATEX}])
 AC_MSG_RESULT([  convert:              ${CONVERT}])
 AC_MSG_RESULT()
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 77ad2e9f5..107567e2a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -60,7 +60,6 @@ INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 
 XSLTPROC=@XSLTPROC@
-XSLBASE=@XSLBASE@
 CAN_UPDATE_TRANSLATIONS=@CAN_UPDATE_TRANSLATIONS@
 XMLLINT=@XMLLINT@
 CAN_BUILD_COMMENTS=@CAN_BUILD_COMMENTS@
@@ -112,8 +111,9 @@ XSLTPROC_CHUNKED_HTML_OPTS = \
 	--stringparam img.src.path ../ \
 	--stringparam html.stylesheet ../style.css
 
-HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
-CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
+DOCBOOK_XSLBASE=http://cdn.docbook.org/release/xsl/current/
+HTML_DOCBOOK_XSL=$(DOCBOOK_XSLBASE)/html/docbook.xsl
+CHUNK_HTML_DOCBOOK_XSL=$(DOCBOOK_XSLBASE)/html/chunk.xsl
 
 # DBLatex's dblatex script for PDF generation from DocBook
 DBLATEX=@DBLATEX@

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

Summary of changes:
 configure.ac    | 66 ---------------------------------------------------------
 doc/Makefile.in |  6 +++---
 2 files changed, 3 insertions(+), 69 deletions(-)


hooks/post-receive
-- 
PostGIS