From ae56f68a3ac5be3f78fa33324adfe4a9a5c30714 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 11 Sep 2006 12:47:01 +0000 Subject: [PATCH] Clarify the relation between gettextize and different automake/aclocal versions. --- NEWS | 6 +++++ gettext-tools/doc/ChangeLog | 4 ++++ gettext-tools/doc/gettext.texi | 10 ++++++--- gettext-tools/misc/ChangeLog | 6 +++++ gettext-tools/misc/gettextize.in | 38 ++++++++++++++++++++------------ 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/NEWS b/NEWS index 8f9fa1a5f..5a33bfaaf 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ * msgmerge is faster now on CPUs with multiple execution units, if compiled with GCC 4.2 or newer. + +* gettextize, when invoked without --intl option, now installs only the .m4 + files that are needed: gettext.m4, iconv.m4, lib-ld.m4, lib-link.m4, + lib-prefix.m4, nls.m4, po.m4, progtest.m4. Version 0.15 - July 2006 @@ -80,6 +84,8 @@ Version 0.15 - July 2006 * Documentation: A complete example showing the use of GNU gettext with the wxWidgets GUI toolkit has been added. + +* The gettext autoconf macros now assume 'aclocal' from automake 1.8 or newer. Version 0.14.6 - June 2006 diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index 1b0ac962c..aab8fef3c 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,7 @@ +2006-09-11 Bruno Haible + + * gettext.texi (aclocal): Mention nls.m4, po.m4, mkdirp.m4. + 2006-09-11 Bruno Haible * gettext.texi (aclocal): Add intl.m4 to file list. diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 7567e473e..0dffe4ce3 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -6947,15 +6947,19 @@ the simplest is to concatenate the files @file{codeset.m4}, @file{intdiv0.m4}, @file{intl.m4}, @file{intmax.m4}, @file{inttypes_h.m4}, @file{inttypes-h.m4}, @file{inttypes-pri.m4}, @file{lcmessage.m4}, @file{lib-ld.m4}, @file{lib-link.m4}, @file{lib-prefix.m4}, @file{lock.m4}, -@file{longdouble.m4}, @file{longlong.m4}, @file{printf-posix.m4}, -@file{progtest.m4}, @file{size_max.m4}, +@file{longdouble.m4}, @file{longlong.m4}, @file{nls.m4}, @file{po.m4}, +@file{printf-posix.m4}, @file{progtest.m4}, @file{size_max.m4}, @file{stdint_h.m4}, @file{uintmax_t.m4}, @file{ulonglong.m4}, @file{visibility.m4}, @file{wchar_t.m4}, @file{wint_t.m4}, @file{xsize.m4} from GNU @code{gettext}'s @file{m4/} directory into a single file. If you have suppressed the @file{intl/} directory, only @file{gettext.m4}, @file{iconv.m4}, @file{lib-ld.m4}, @file{lib-link.m4}, @file{lib-prefix.m4}, -@file{progtest.m4} need to be concatenated. +@file{nls.m4}, @file{po.m4}, @file{progtest.m4} need to be concatenated. + +If you are not using GNU @code{automake} 1.8 or newer, you will need to +add a file @file{mkdirp.m4} from a newer automake distribution to the +list of files above. If you already have an @file{aclocal.m4} file, then you will have to merge the said macro files into your @file{aclocal.m4}. Note that if diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index f89c502c8..034cdb829 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,9 @@ +2006-09-11 Bruno Haible + + * gettextize.in (have_automake19, min_automake_version): New variables. + (m4filelist): Use the minimum needed file list if --intl was not + specified and automake version is >= 1.9. + 2006-09-11 Bruno Haible * gettextize.in (m4filelist): Add intl.m4. diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index f8eeffe60..965600bca 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -724,19 +724,29 @@ Please fill po/POTFILES.in as described in the documentation. fi $do_changelog && func_poChangeLog_finish -m4filelist=' codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 - intl.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 - lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 - nls.m4 po.m4 printf-posix.m4 progtest.m4 size_max.m4 stdint_h.m4 - uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4' -# We cannot omit codeset.m4, glibc2.m4, glibc21.m4, intdiv0.m4, intl.m4, -# intmax.m4, inttypes_h.m4, inttypes-h.m4, inttypes-pri.m4, lcmessage.m4, -# lock.m4, longdouble.m4, longlong.m4, nls.m4, po.m4, printf-posix.m4, -# size_max.m4, stdint_h.m4, uintmax_t.m4, ulonglong.m4, visibility.m4, -# wchar_t.m4, wint_t.m4, xsize.m4 -# if test -z "$intldir", otherwise "aclocal -I m4" might give an error. -# (aclocal doesn't know which macros are really needed, it looks which macros -# are potentially needed.) +# Determine whether we can assume automake 1.9 or newer. +have_automake19= +if (aclocal --version) >/dev/null 2>/dev/null; then + aclocal_version=`aclocal --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'` + case $aclocal_version in + 1.9* | 1.[1-9][0-9]* | [2-9]*) have_automake19=yes ;; + esac +fi + +m4filelist='gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 + po.m4 progtest.m4' +# With aclocal versions < 1.9 we need all m4 files, otherwise "aclocal -I m4" +# might give an error. (aclocal < 1.9 didn't know which macros are really +# needed, it looked which macros are potentially needed.) +min_automake_version=1.9 +if test -n "$intldir" || test -z "$have_automake19"; then + # Add intl.m4 and its dependencies. + m4filelist=$m4filelist' codeset.m4 glibc2.m4 glibc21.m4 intdiv0.m4 intl.m4 + intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 lock.m4 + longdouble.m4 longlong.m4 printf-posix.m4 size_max.m4 stdint_h.m4 + uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4' + min_automake_version=1.8 +fi # All sorts of bugs could occur if the configure file was remade with the wrong # version of gettext.m4 et al. (because then the configure and the po/Makefile.in.in @@ -982,7 +992,7 @@ if test -f "$srcdir/Makefile.am"; then fi please="$please Please run 'aclocal -I $m4dir' to regenerate the aclocal.m4 file. -You need aclocal from GNU automake 1.5 (or newer) to do this. +You need aclocal from GNU automake $min_automake_version (or newer) to do this. Then run 'autoconf' to regenerate the configure file. " -- 2.47.3