[no subject]

[Gavin D. Smith]

branch: master
commit 1729badc33145fe02d8c73177de88cedecbf7aaf
Author: Bruno Haible <bruno@clisp.org>
AuthorDate: Wed Aug 7 18:56:11 2024 +0100

    build: Prepare for use of autopoint.
    
    * configure.ac: Add comments about use of autopoint.
    * tp/Texinfo/XS/configure.ac: Specify the same GNU gettext
    version as the top-level configure.ac. Add comments about use
    of autopoint.
---
 ChangeLog                  |  9 +++++++++
 configure.ac               |  6 +++++-
 tp/Texinfo/XS/configure.ac | 10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e22d7e2202..f586804712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-08-07  Bruno Haible  <bruno@clisp.org>
+
+       build: Prepare for use of autopoint.
+
+       * configure.ac: Add comments about use of autopoint.
+       * tp/Texinfo/XS/configure.ac: Specify the same GNU gettext
+       version as the top-level configure.ac. Add comments about use
+       of autopoint.
+
 2024-07-27  Patrice Dumas  <pertusus@free.fr>
 
        * t/init_files_tests.t
diff --git a/configure.ac b/configure.ac
index 1543971d2b..5b1fffb5d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,8 +384,12 @@ AC_ARG_WITH([external-Text-Unidecode],
 AC_SUBST([USE_UNICODE])
 AC_SUBST([USE_EXTERNAL_UNIDECODE])
 
-# i18n support.  To update to a new version of gettext, run:
+# i18n support.  To upgrade to a new version of gettext, run:
 #   gettextize -f --po-dir=po --po-dir=po_document
+# To fetch the *.m4 files without upgrading, run:
+#   autopoint -f
+# and then revert any changes of gnulib/m4/*.m4 files that downgrade from a
+# newer serial number (from gnulib) to an older serial number (from gettext).
 # See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
 AM_GNU_GETTEXT_VERSION([0.21])
 AM_GNU_GETTEXT([external])
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index f9fffdc463..9c95e76fef 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -133,7 +133,17 @@ AC_PROG_CC
 
 gl_EARLY
 
+# i18n support.  Use the same GNU gettext version as the main configure.ac 
file.
+# To upgrade to a new version of gettext, run:
+#   gettextize -f --po-dir=../../../po --no-changelog
+# To fetch the *.m4 files without upgrading, run:
+#   autopoint -f; rm -rf po
+# and then revert any changes of gnulib/m4/*.m4 files that downgrade from a
+# newer serial number (from gnulib) to an older serial number (from gettext).
+# See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
+AM_GNU_GETTEXT_VERSION([0.21])
 AM_GNU_GETTEXT([external])
+
 AM_MISSING_PROG([XSUBPP], [xsubpp])
 AM_MISSING_PROG([GAWK], [gawk])