diff options
author | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 23:07:00 +0200 |
---|---|---|
committer | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 23:07:00 +0200 |
commit | cc7231cc3668a387ae36905efca11f9d236c8df6 (patch) | |
tree | f0cf53f6c41586cabfead192ab344bdf7b16a77b /t/gettext-macros.sh | |
parent | 1370ce5f83c54df7ef863abb2ade73f3d5ce69e0 (diff) | |
parent | c946ae6f25422d45e54de0fd69309cbb438f942d (diff) | |
download | automake-cc7231cc3668a387ae36905efca11f9d236c8df6.tar.gz |
Merge branch 'minor'
Diffstat (limited to 't/gettext-macros.sh')
-rw-r--r-- | t/gettext-macros.sh | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh index 34f4e9c0e..a8185af84 100644 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@ -28,29 +28,20 @@ extract_program_version () echo "# Automatically generated by $me." > get.sh echo : >> get.sh -# The 'gettextize' and 'autopoint' scripts will look into Makefile.am. +# The 'autopoint' script will look into Makefile.am. echo AUTOMAKE_OPTIONS = -Wno-obsolete > Makefile.am echo ACLOCAL_AMFLAGS = -I m4 >> Makefile.am -# Prefer autopoint to gettextize, since the more modern versions of the -# latter might unconditionally require user interaction to complete; -# yes, this means confirmation from /dev/tty (!) -- see: +# Prefer autopoint to gettextize, since the latter unconditionally +# requires user interaction to complete; yes, this means confirmation +# from /dev/tty (!) -- see: # <http://lists.gnu.org/archive/html/bug-gettext/2011-12/msg00000.html> -# Since this "forced interaction" behaviour of gettextize wasn't present -# before the introduction of autopoint, we should be able to safely -# fall back to calling gettextize non-interactively if autopoint is not -# present. -if autopoint --version; then - am_gettextize_command=autopoint -else - am_gettextize_command=gettextize -fi -# We will need to specify the correct autopoint (or gettextize) version -# in the AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint -# (or gettextize) to setup the correct infrastructure -- in particular, -# for what concerns us, to bring in all the required .m4 files. -autopoint_version=$(extract_program_version $am_gettextize_command) \ +# We will need to specify the correct autopoint version in the +# AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint to +# setup the correct infrastructure -- in particular, for what concerns +# us, to bring in all the required .m4 files. +autopoint_version=$(extract_program_version autopoint) \ && test -n "$autopoint_version" \ || autopoint_version=0.10.35 @@ -62,11 +53,11 @@ AM_GNU_GETTEXT AM_GNU_GETTEXT_VERSION([$autopoint_version]) END -if $am_gettextize_command --force && test -f m4/gettext.m4; then +if autopoint --force && test -f m4/gettext.m4; then echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh echo "export ACLOCAL_PATH" >> get.sh else - # Older versions of gettext might not have a gettextize program + # Older versions of gettext might not have an autopoint program # available, but this doesn't mean the user hasn't made the gettext # macros available, e.g., by properly setting ACLOCAL_PATH. rm -rf m4 @@ -94,13 +85,13 @@ $ACLOCAL --force -I m4 || cat >> get.sh <<'END' ACLOCAL="$ACLOCAL -Wno-syntax" END -# Remove any Makefile.in possibly created by gettextize/autopoint, to -# avoid spurious maintainer-check failures. +# Remove any Makefile.in possibly created by autopoint, to avoid spurious +# maintainer-check failures. rm -f $(find . -name Makefile.in) -# The file gettextize or autopoint might have copied in the 'm4' -# subdirectory of the test directory are going to be needed by -# other tests, so we must not remove the test directory. +# The file autopoint might have copied in the 'm4' subdirectory of the +# test directory are going to be needed by other tests, so we must not +# remove the test directory. keep_testdirs=yes : |