diff options
| -rw-r--r-- | t/gettext-basics.sh | 21 | ||||
| -rw-r--r-- | t/gettext-config-rpath.sh | 6 | ||||
| -rw-r--r-- | t/gettext-macros.sh | 4 | ||||
| -rw-r--r-- | t/gettext-pr381.sh | 2 | ||||
| -rw-r--r-- | t/subdir-cond-gettext.sh | 6 |
5 files changed, 17 insertions, 22 deletions
diff --git a/t/gettext-basics.sh b/t/gettext-basics.sh index 93fe782f4..cb2101086 100644 --- a/t/gettext-basics.sh +++ b/t/gettext-basics.sh @@ -20,7 +20,7 @@ required='gettext' . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) AC_OUTPUT END @@ -31,28 +31,23 @@ mkdir po intl $ACLOCAL $AUTOCONF -# po/ and intl/ are required. +# po/ is required. intl/ may not be used with external gettext. +# Internal (bundled) was deprecated upstream in gettext 0.18 (2010) +# and made fatal in gettext 0.20 (2019). AUTOMAKE_fails --add-missing grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr echo 'SUBDIRS = po' >Makefile.am -AUTOMAKE_fails --add-missing -grep 'AM_GNU_GETTEXT.*intl' stderr +# Should not fail. +$AUTOMAKE --add-missing echo 'SUBDIRS = intl' >Makefile.am AUTOMAKE_fails --add-missing grep 'AM_GNU_GETTEXT.*po' stderr -# Ok. - echo 'SUBDIRS = po intl' >Makefile.am -$AUTOMAKE --add-missing - -# Make sure distcheck runs './configure --with-included-gettext'. -./configure -echo distdir: > po/Makefile -echo distdir: > intl/Makefile -$MAKE -n distcheck | grep '.*--with-included-gettext' +AUTOMAKE_fails --add-missing +grep 'intl.*SUBDIRS.*AM_GNU_GETTEXT' stderr : diff --git a/t/gettext-config-rpath.sh b/t/gettext-config-rpath.sh index 3953a0c3d..522b42fce 100644 --- a/t/gettext-config-rpath.sh +++ b/t/gettext-config-rpath.sh @@ -20,14 +20,14 @@ required='gettext' . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) # config.rpath is required by versions >= 0.14.3. AM_GNU_GETTEXT_VERSION([0.14.3]) AC_OUTPUT END -echo 'SUBDIRS = po intl' >Makefile.am -mkdir po intl +echo 'SUBDIRS = po' >Makefile.am +mkdir po # If aclocal fails here, it may be that gettext is too old to provide # AM_GNU_GETTEXT_VERSION. Similarly, autopoint will fail if it's diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh index e352e6790..1376be81e 100644 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@ -47,8 +47,8 @@ autopoint_version=$(extract_program_version autopoint) \ cat > configure.ac <<END AC_INIT([foo], [1.0]) AC_PROG_CC -# Both required by autopoint. -AM_GNU_GETTEXT +# Both required by autopoint. Newer gettext (0.20+) requires external. +AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([$autopoint_version]) END diff --git a/t/gettext-pr381.sh b/t/gettext-pr381.sh index 562e2226c..cac197271 100644 --- a/t/gettext-pr381.sh +++ b/t/gettext-pr381.sh @@ -21,7 +21,7 @@ required='gettext' . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) AC_OUTPUT END diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh index 023eff134..a203c025d 100644 --- a/t/subdir-cond-gettext.sh +++ b/t/subdir-cond-gettext.sh @@ -20,18 +20,18 @@ required=gettext . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) AM_CONDITIONAL([MAUDE], [true]) ALL_LINGUAS= AC_SUBST([ALL_LINGUAS]) END -mkdir po intl +mkdir po : >config.rpath cat > Makefile.am << 'END' if MAUDE -SUBDIRS = po intl +SUBDIRS = po else SUBDIRS = endif |