[postgis-tickets] [SCM] PostGIS branch main updated. 3.2.0-18-g9647b4667

[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  9647b4667cdc49e0c4ea5e18c0dbe61589f2ed56 (commit)
      from  7ece57ac6e9f0de3bc919405378ad873d76f2f03 (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 9647b4667cdc49e0c4ea5e18c0dbe61589f2ed56
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 6 00:36:16 2022 +0100

    Look for xml2pot and msgmerge at ./configure time
    
    Avoids `make update-po` and `make update-pot` possibly creating
    empty template files.

diff --git a/configure.ac b/configure.ac
index f41bbfb2a..c85bdd73d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,16 @@ if test "x$XSLTPROC" = "x"; then
   CAN_BUILD_COMMENTS=no
 fi
 
+AC_PATH_PROG([XML2POT], [xml2pot], [])
+if test "x$XML2POT" = "x"; then
+	AC_MSG_WARN([xml2pot is not installed so translations cannot be updated])
+fi
+
+AC_PATH_PROG([MSGMERGE], [msgmerge], [])
+if test "x$MSGMERGE" = "x"; then
+	AC_MSG_WARN([msgmerge is not installed so translations cannot be updated])
+fi
+
 CAN_BUILD_PDF=${CAN_BUILD_COMMENTS}
 
 AC_PATH_PROG([IMAGEMAGICK], [convert], [])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index dc396dffc..fbb93c118 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -38,6 +38,7 @@ INSTALL_DATA=@INSTALL_DATA@
 
 XSLTPROC=@XSLTPROC@
 XSLBASE=@XSLBASE@
+CAN_UPDATE_TRANSLATIONS=@CAN_UPDATE_TRANSLATIONS@
 XMLLINT=@XMLLINT@
 CAN_BUILD_COMMENTS=@CAN_BUILD_COMMENTS@
 PERL=@PERL@
@@ -82,10 +83,10 @@ DBLATEX=@DBLATEX@
 IMAGEMAGICK=@IMAGEMAGICK@
 
 # Gettext for translated documentation
-MSGMERGE=msgmerge
+MSGMERGE=@MSGMERGE@
 
 # XML gettext tools
-XML2POT=xml2pot
+XML2POT=@XML2POT@
 
 # DOCBOOK to EPUB
 DBTOEPUB=dbtoepub
@@ -166,6 +167,9 @@ XML_INPUTS = $(XML_SOURCES) $(XML_GENERATED_SOURCES)
 XML_INPUTS_POT = $(XML_SOURCES:%.xml=po/templates/%.xml.pot)
 
 .PHONY: $(XML_INPUTS_POT)
+ifeq ($(XML2POT),)
+$(XML_INPUTS_POT): requirements_not_met_xml2pot
+else
 $(XML_INPUTS_POT): po/templates/%.xml.pot: %.xml
 	@if test -f $@; then \
 	  $(XML2POT) $< > $@.tmp; \
@@ -180,11 +184,15 @@ $(XML_INPUTS_POT): po/templates/%.xml.pot: %.xml
   else \
 	  $(XML2POT) $< > $@; \
   fi;
+endif
 
 # Update translation templates
 update-pot: $(XML_INPUTS_POT)
 
 # Creates or updates translation files
+ifeq ($(MSGMERGE),)
+update-po: requirements_not_met_msgmerge
+else
 update-po: $(XML_INPUTS_POT)
 	@for lang in $(translations); do \
     echo "Creating po files for language $$lang..." ; \
@@ -198,6 +206,7 @@ update-po: $(XML_INPUTS_POT)
       fi; \
     done; \
   done
+endif
 
 pull-tx:
 	tx pull --all
@@ -481,3 +490,15 @@ requirements_not_met_imagemagick:
 	@echo
 	@echo "  http://postgis.net/documentation"
 	@echo
+
+requirements_not_met_gettext:
+	@echo
+	@echo "configure was unable to find both gettext's 'msgmerge' utility program."
+	@echo "To update the translation templates, install gettext and then re-run configure."
+	@echo
+
+requirements_not_met_xml2pot:
+	@echo
+	@echo "configure was unable to find the 'xml2pot' utility program."
+	@echo "To update the translation templates, install poxml and then re-run configure."
+	@echo

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

Summary of changes:
 configure.ac    | 10 ++++++++++
 doc/Makefile.in | 25 +++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS