[postgis-tickets] [SCM] PostGIS branch main updated. 3.2.0-19-g13be039f8

[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, main has been updated
       via  13be039f8b0a4816458a3562b4070f87e1950aa9 (commit)
      from  9647b4667cdc49e0c4ea5e18c0dbe61589f2ed56 (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 13be039f8b0a4816458a3562b4070f87e1950aa9
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 6 01:11:51 2022 +0100

    Cleanup imagemagick's convert checking

diff --git a/configure.ac b/configure.ac
index c85bdd73d..7aa6b8117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,8 +199,8 @@ fi
 
 CAN_BUILD_PDF=${CAN_BUILD_COMMENTS}
 
-AC_PATH_PROG([IMAGEMAGICK], [convert], [])
-if test "x$IMAGEMAGICK" = "x"; then
+AC_PATH_PROG([CONVERT], [convert], [])
+if test "x$CONVERT" = "x"; then
 	AC_MSG_WARN([ImageMagick does not seem to be installed. Documentation cannot be built])
   CAN_BUILD_PDF=no
 fi
@@ -1808,7 +1808,7 @@ 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:              ${IMAGEMAGICK}])
+AC_MSG_RESULT([  convert:              ${CONVERT}])
 AC_MSG_RESULT([  mathml2.dtd:          ${MATHML2_DTD}])
 AC_MSG_RESULT()
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fbb93c118..f46dbc414 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -79,9 +79,6 @@ CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
 # DBLatex's dblatex script for PDF generation from DocBook
 DBLATEX=@DBLATEX@
 
-# Imagemagick's convert utility program for generated images used in the documentation
-IMAGEMAGICK=@IMAGEMAGICK@
-
 # Gettext for translated documentation
 MSGMERGE=@MSGMERGE@
 
@@ -482,15 +479,6 @@ requirements_not_met_xslbase:
 	@echo "  http://postgis.net/documentation"
 	@echo
 
-requirements_not_met_imagemagick:
-	@echo
-	@echo "configure was unable to find the ImageMagick's 'convert' utility program."
-	@echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
-	@echo "refer to online manual:"
-	@echo
-	@echo "  http://postgis.net/documentation"
-	@echo
-
 requirements_not_met_gettext:
 	@echo
 	@echo "configure was unable to find both gettext's 'msgmerge' utility program."

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

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


hooks/post-receive
-- 
PostGIS