[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1080-g17d1f1518

[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  17d1f1518f36e2c772ced3d511766776057bb1cd (commit)
      from  19525b45615a69d64ab6201b42ed7e02003c5d3f (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 17d1f1518f36e2c772ced3d511766776057bb1cd
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Jun 30 00:15:44 2023 +0200

    Do not assume DBTOEPUB is available

diff --git a/configure.ac b/configure.ac
index ae7a4bb08..4d741b479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,6 +237,14 @@ fi
 AC_SUBST(CAN_BUILD_COMMENTS)
 AC_SUBST(CAN_BUILD_PDF)
 
+CAN_BUILD_EPUB=${CAN_BUILD_COMMENTS}
+AC_PATH_PROG([DBTOEPUB], [dbtoepub], [])
+if test "x$DBTOEPUB" = "x"; then
+  AC_MSG_WARN([dbtoepub is not installed so EPUB documentation cannot be built])
+  CAN_BUILD_EPUB=no
+fi
+AC_SUBST(CAN_BUILD_EPUB)
+
 AC_PATH_PROG([XMLLINT], [xmllint], [])
 if test "x$XMLLINT" = "x"; then
 	AC_MSG_WARN([xmllint is not installed so documentation cannot be checked])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3e2900ba8..aeac77a19 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -52,6 +52,8 @@ CAN_UPDATE_TRANSLATIONS=@CAN_UPDATE_TRANSLATIONS@
 XMLLINT=@XMLLINT@
 CAN_BUILD_COMMENTS=@CAN_BUILD_COMMENTS@
 PERL=@PERL@
+#CAN_BUILD_PDF=@CAN_BUILD_PDF@
+#CAN_BUILD_EPUB=@CAN_BUILD_EPUB@
 
 # To allow network access use:
 #
@@ -104,7 +106,7 @@ MSGINIT=@MSGINIT@
 XML2POT=@XML2POT@
 
 # DOCBOOK to EPUB
-DBTOEPUB=dbtoepub
+DBTOEPUB=@DBTOEPUB@
 
 # Directories for postgresql subdirectories
 PGSQL_DOCDIR=@PGSQL_DOCDIR@
@@ -120,6 +122,10 @@ ifeq ($(CAN_BUILD_PDF),yes)
 BUILD_TARGET += pdf
 endif
 
+ifeq ($(CAN_BUILD_EPUB),yes)
+BUILD_TARGET += epub
+endif
+
 # TODO: add "html" to the BUILD_TARGET if it can be built
 
 all: $(BUILD_TARGET)
@@ -324,7 +330,7 @@ ifeq ($(DBLATEX),)
 	@echo "configure was unable to find the 'dblatex' utility program."
 	@echo "To create pdf files, install dblatex and then re-run configure."
 	@echo
-	false
+	@false
 else
 	$(DBLATEX) -T native -t pdf \
 		 -x "--path $(XSLT_PATH)" \
@@ -342,15 +348,17 @@ else
 endif
 
 postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
-	if test x"$(DBTOEPUB)" = x; then \
-	   echo "Error: dbtoepub not found, can't build epub"; \
-	   echo "       try installing dbtoepub"; \
-	   false; \
-	else \
-		$(DBTOEPUB) -c "${PWD}/html/style.css" \
-		 -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub \
-		  $<; \
-	fi
+ifeq ($(DBTOEPUB),)
+	@echo
+	@echo "configure was unable to find the 'dbtoepub' utility program."
+	@echo "To create pdf files, install dbtoepub and then re-run configure."
+	@echo
+	@false
+else
+	$(DBTOEPUB) -c "${PWD}/html/style.css" \
+	 -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub \
+		$<
+endif
 
 epub: postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub
 

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

Summary of changes:
 configure.ac    |  8 ++++++++
 doc/Makefile.in | 30 +++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS