build: Substitute archive version with configure

* gettext-tools/configure.ac (ARCHIVE_VERSION): New substituted
variable.
* gettext-tools/misc/gettextize.in (archive_version): New variable, set
to ARCHIVE_VERSION.  Use it as the argument of AM_GNU_GETTEXT_VERSION.
* gettext-tools/tests/init-env.in (ARCHIVE_VERSION): New substituted
variable.
* gettext-tools/tests/autopoint-2: Use ARCHIVE_VERSION, instead of the
hard-coded version string.
* gettext-tools/tests/autopoint-3: Likewise.

diff --git a/Admin/release-steps b/Admin/release-steps
index 1eab4d353715bce3b775ef5a43668f7484668b69..c568442f3a090443e25764d682cee1b52f084534 100644 (file)
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -112,17 +112,13 @@ Release procedure
 
 * Update autopoint related files:
 
-  - gettext-tools/misc/autopoint.in
-
-    Update the case statement to include the latest release.
+  - gettext-tools/configure.ac
 
-  - gettext-tools/tests/autopoint-[23]
+    Update ARCHIVE_VERSION
 
-    Update required_gettext_version.
-
-  - gettext-tools/misc/gettextize.in
+  - gettext-tools/misc/autopoint.in
 
-    Update gettext_version.
+    Update the case statement to include the latest release.
 
   and commit the changes.
 

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index a253ac51e41872a000d53f3bd09a31da36689e65..db5ff2aee4022090b5ae172fe2308e366f11b014 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-28  Daiki Ueno  <ueno@gnu.org>
+
+       * configure.ac (ARCHIVE_VERSION): New substituted variable.
+
 2015-07-10  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.5 released.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index bbc0f50880ef7ac4651b0663a54359326156486c..ff0f2d10f6d3dbd9edb12f5bccad3bb1a53382a7 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -458,6 +458,9 @@ changequote([,])dnl
 fi
 AC_SUBST([ARCHIVE_FORMAT])
 
+ARCHIVE_VERSION=0.19.5
+AC_SUBST([ARCHIVE_VERSION])
+
 dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 AC_PATH_PROG([DVIPS], [dvips], [$ac_aux_dir_abs/missing dvips])

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 62d550a683e84c9a4457375ee1fc290ea1a622c2..53c25ccf3f3d905cf3e3d9255bed9d0adc5e588b 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-28  Daiki Ueno  <ueno@gnu.org>
+
+       * gettextize.in (archive_version): New variable, set to
+       ARCHIVE_VERSION.  Use it as the argument of
+       AM_GNU_GETTEXT_VERSION.
+
 2015-07-27  Daiki Ueno  <ueno@gnu.org>
 
        gettextize: Use a crafted version string

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 6562097b3ceb269e604f0600789dc6db8e9c6bdb..bd7eb929eb71e78ac4af30fa35a19ef53a50d0c9 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -23,7 +23,7 @@
 progname=$0
 package=@PACKAGE@
 version=@VERSION@
-gettext_version=0.19.5
+archive_version=@ARCHIVE_VERSION@
 
 # Set variables
 # - gettext_datadir     directory where the data files are stored.
@@ -1236,8 +1236,8 @@ sed -e 's%sed -e "/POTFILES =/r po/POTFILES" po/Makefile\.in > po/Makefile *;* *
 func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
 sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
 func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
-sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$gettext_version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $gettext_version."
+sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$archive_version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
+func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $archive_version."
 $do_changelog && func_ChangeLog_finish
 
 # Recommend replacement for deprecated Makefile variables.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 024c7cba1ad5907698a77753852e4acfacb57e72..042886ed692320a485c1264a970346dfa2999626 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-28  Daiki Ueno  <ueno@gnu.org>
+
+       * init-env.in (ARCHIVE_VERSION): New substituted variable.
+       * autopoint-2: Use ARCHIVE_VERSION, instead of the hard-coded
+       version string.
+       * autopoint-3: Likewise.
+
 2015-07-10  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.5 released.

diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2
index f58132ef88154d5dd3e1281f5c47c8d4a44f1a41..c807b3a5da7c8b15ff538771eddb3a4784653039 100755 (executable)
--- a/gettext-tools/tests/autopoint-2
+++ b/gettext-tools/tests/autopoint-2
@@ -3,8 +3,6 @@
 
 # Test the autopoint program, without Automake.
 
-required_gettext_version=0.19.5
-
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
   || { echo "Skipping test: autoconf not found"; exit 77; }
@@ -29,7 +27,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 
 AC_PROG_CC
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
+AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
@@ -57,7 +55,7 @@ AC_CONFIG_SRCDIR(hello.c)
 
 AC_PROG_CC
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
+AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
@@ -84,7 +82,7 @@ AC_CONFIG_SRCDIR(hello.c)
 
 AC_PROG_CC
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
+AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION])
 
 # first macro directory, in which po.m4, etc. belong
 AC_CONFIG_MACRO_DIR([gettext-m4])
@@ -118,7 +116,7 @@ AC_CONFIG_SRCDIR(hello.c)
 
 AC_PROG_CC
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
+AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
@@ -150,7 +148,7 @@ _gt_recurse([a], [b], , [c])
 
 AC_PROG_CC
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
+AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile.in])

diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
index a6b185183fd074e6aaa4ac25164e5d02127e3f8c..c0f468cebba0873591f2c4e1b9a599ae8f1feb75 100755 (executable)
--- a/gettext-tools/tests/autopoint-3
+++ b/gettext-tools/tests/autopoint-3
@@ -3,8 +3,6 @@
 
 # Test the autopoint program, with Automake.
 
-required_gettext_version=0.19.5
-
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
   || { echo "Skipping test: autoconf not found"; exit 77; }
@@ -61,7 +59,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
 AM_GNU_GETTEXT([use-libtool])
-AM_GNU_GETTEXT_VERSION([$required_gettext_version])
+AM_GNU_GETTEXT_VERSION([$ARCHIVE_VERSION])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
@@ -132,18 +130,6 @@ test $? = 0 || { cat autopoint.err; exit 1; }
 ${CONFIG_SHELL} ./configure --with-included-gettext >/dev/null 2>autpoint.err
 test $? = 0 || { cat autopoint.err; exit 1; }
 
-# Workaround for 0.18.3 or earlier: Processing intl/plural.y with
-# Bison 3.0.1 or later generates a wrong code.  Use pre-generated
-# intl/plural.c in that case.
-test -f intl/plural.c && touch intl/plural.c
-
-# Workaround for a bug in 0.19 and 0.19.1: ChangeLog is missing in the archive.
-case "$required_gettext_version" in
-  0.19 | 0.19.1)
-    test -f intl/ChangeLog || : > intl/ChangeLog
-    ;;
-esac
-
 ${MAKE} >/dev/null 2>autopoint.err
 test $? = 0 || { cat autopoint.err; exit 1; }
 

diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in
index fa428f92ec5cfbe6c4298d6af05e3e7157a4b135..1ee47756106f0c28ed507ab0c57aafbc8971d8d2 100644 (file)
--- a/gettext-tools/tests/init-env.in
+++ b/gettext-tools/tests/init-env.in
@@ -22,6 +22,7 @@ LOCALE_FR="@LOCALE_FR@"
 LOCALE_FR_UTF8="@LOCALE_FR_UTF8@"
 LOCALE_JA="@LOCALE_JA@"
 host_os="@host_os@"
+ARCHIVE_VERSION="@ARCHIVE_VERSION@"
 
 : ${GETTEXT=tstgettext}
 : ${NGETTEXT=tstngettext}