From: Bruno Haible Date: Sun, 11 Nov 2018 12:48:56 +0000 (+0100) Subject: gettextize: Require automake >= 1.9. X-Git-Tag: v0.20~231 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=198164be9e4ebc706ad7ffcc0f8b6a0608ea3de9;p=thirdparty%2Fgettext.git gettextize: Require automake >= 1.9. * gettext-tools/misc/gettextize.in: Signal an error if 'aclocal' from automake >= 1.9 is not found. Stop installing intldir.m4, intl.m4 and its dependencies. * gettext-tools/doc/gettext.texi (mkinstalldirs, aclocal): State the requirement to have automake >= 1.9. * gettext-tools/m4/Makefile.am (aclocal_DATA): Don't install codeset.m4, extern-inline.m4, fcntl-o.m4, glibc2.m4, glibc21.m4, intdiv0.m4, intl.m4, intl-thread-locale.m4, intldir.m4, intmax.m4, inttypes_h.m4, inttypes-pri.m4, lcmessage.m4, lock.m4, longlong.m4, printf-posix.m4, size_max.m4, stdint_h.m4, threadlib.m4, uintmax_t.m4, visibility.m4, wchar_t.m4, wint_t.m4, xsize.m4. * PACKAGING: Remove the *.m4 files that are no longer installed. --- diff --git a/PACKAGING b/PACKAGING index dcb42be2d..f91884e78 100644 --- a/PACKAGING +++ b/PACKAGING @@ -115,37 +115,15 @@ following file list. $prefix/share/gettext/archive.dir.tar.gz (only installed if --without-git specified) $prefix/share/gettext/archive.cvs.tar.gz (only installed if --with-cvs specified) $prefix/share/gettext-$VERSION/its/* - $prefix/share/aclocal/codeset.m4 - $prefix/share/aclocal/fcntl-o.m4 $prefix/share/aclocal/gettext.m4 - $prefix/share/aclocal/glibc2.m4 - $prefix/share/aclocal/glibc21.m4 $prefix/share/aclocal/iconv.m4 - $prefix/share/aclocal/intdiv0.m4 - $prefix/share/aclocal/intl.m4 - $prefix/share/aclocal/intl-thread-locale.m4 - $prefix/share/aclocal/intldir.m4 $prefix/share/aclocal/intlmacosx.m4 - $prefix/share/aclocal/intmax.m4 - $prefix/share/aclocal/inttypes_h.m4 - $prefix/share/aclocal/inttypes-pri.m4 - $prefix/share/aclocal/lcmessage.m4 $prefix/share/aclocal/lib-ld.m4 $prefix/share/aclocal/lib-link.m4 $prefix/share/aclocal/lib-prefix.m4 - $prefix/share/aclocal/lock.m4 - $prefix/share/aclocal/longlong.m4 $prefix/share/aclocal/nls.m4 $prefix/share/aclocal/po.m4 - $prefix/share/aclocal/printf-posix.m4 $prefix/share/aclocal/progtest.m4 - $prefix/share/aclocal/size_max.m4 - $prefix/share/aclocal/stdint_h.m4 - $prefix/share/aclocal/uintmax_t.m4 - $prefix/share/aclocal/visibility.m4 - $prefix/share/aclocal/wchar_t.m4 - $prefix/share/aclocal/wint_t.m4 - $prefix/share/aclocal/xsize.m4 $prefix/share/emacs/site-lisp/po-compat.el $prefix/share/emacs/site-lisp/po-compat.elc $prefix/share/emacs/site-lisp/po-mode.el diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 23187cb46..864c4013b 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -7994,8 +7994,7 @@ AC_CONFIG_AUX_DIR([@var{subdir}]) With earlier versions of GNU gettext, you needed to add the GNU @file{mkinstalldirs} script to your distribution. This is not needed any -more. You can remove it if you not also using an automake version older than -automake 1.9. +more. You can remove it. @node aclocal @subsection @file{aclocal.m4} at top level @@ -8007,10 +8006,6 @@ the simplest is to concatenate the files @file{gettext.m4}, @file{lib-prefix.m4}, @file{nls.m4}, @file{po.m4}, @file{progtest.m4} from GNU @code{gettext}'s @file{m4/} directory into a single file. -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 you are upgrading from a previous release of GNU @code{gettext}, you @@ -8020,8 +8015,11 @@ change a little from one release of GNU @code{gettext} to the next. Their contents may vary as we get more experience with strange systems out there. -If you are using GNU @code{automake} 1.5 or newer, it is enough to put -these macro files into a subdirectory named @file{m4/} and add the line +You should be using GNU @code{automake} 1.9 or newer. With it, you need +to copy the files @file{gettext.m4}, @file{intlmacosx.m4}, @file{iconv.m4}, +@file{lib-ld.m4}, @file{lib-link.m4}, @file{lib-prefix.m4}, @file{nls.m4}, +@file{po.m4}, @file{progtest.m4} from GNU @code{gettext}'s @file{m4/} +directory to a subdirectory named @file{m4/} and add the line @example ACLOCAL_AMFLAGS = -I m4 diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 0d34b8de8..9f6408a5b 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -7,36 +7,12 @@ aclocal_DATA = \ ../../gettext-runtime/gnulib-m4/lib-ld.m4 \ ../../gettext-runtime/gnulib-m4/lib-link.m4 \ ../../gettext-runtime/gnulib-m4/lib-prefix.m4 \ - ../../gettext-runtime/m4/codeset.m4 \ - ../../gettext-runtime/m4/extern-inline.m4 \ - ../../gettext-runtime/m4/fcntl-o.m4 \ ../../gettext-runtime/m4/gettext.m4 \ - ../../gettext-runtime/m4/glibc2.m4 \ - ../../gettext-runtime/m4/glibc21.m4 \ ../../gettext-runtime/m4/iconv.m4 \ - ../../gettext-runtime/m4/intdiv0.m4 \ - ../../gettext-runtime/m4/intl.m4 \ - ../../gettext-runtime/m4/intl-thread-locale.m4 \ - ../../gettext-runtime/m4/intldir.m4 \ ../../gettext-runtime/m4/intlmacosx.m4 \ - ../../gettext-runtime/m4/intmax.m4 \ - ../../gettext-runtime/m4/inttypes_h.m4 \ - ../../gettext-runtime/m4/inttypes-pri.m4 \ - ../../gettext-runtime/m4/lcmessage.m4 \ - ../../gettext-runtime/m4/lock.m4 \ - ../../gettext-runtime/m4/longlong.m4 \ ../../gettext-runtime/m4/nls.m4 \ ../../gettext-runtime/m4/po.m4 \ - ../../gettext-runtime/m4/printf-posix.m4 \ - ../../gettext-runtime/m4/progtest.m4 \ - ../../gettext-runtime/m4/size_max.m4 \ - ../../gettext-runtime/m4/stdint_h.m4 \ - ../../gettext-runtime/m4/threadlib.m4 \ - ../../gettext-runtime/m4/uintmax_t.m4 \ - ../../gettext-runtime/m4/visibility.m4 \ - ../../gettext-runtime/m4/wchar_t.m4 \ - ../../gettext-runtime/m4/wint_t.m4 \ - ../../gettext-runtime/m4/xsize.m4 + ../../gettext-runtime/m4/progtest.m4 # Files installed for the examples. diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 997df0e4f..e390df29e 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -301,6 +301,19 @@ if test -n "$intldir"; then func_fatal_error "The option '--intl' is no longer available." fi +# Require 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 +if test -z "$have_automake19"; then + func_fatal_error "You need the 'aclocal' program from automake 1.9 or newer." +fi +min_automake_version=1.9 + # Command-line argument processing. # Analyzes the remaining arguments. # Sets the variables @@ -781,15 +794,6 @@ Please fill $podir/POTFILES.in as described in the documentation. $do_changelog && func_poChangeLog_finish done -# 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 @@ -797,38 +801,6 @@ m4filelist=' 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 -z "$have_automake19"; then - # Add intldir.m4, intl.m4 and its dependencies. - m4filelist=$m4filelist' - codeset.m4 - fcntl-o.m4 - glibc2.m4 - glibc21.m4 - intdiv0.m4 - intl.m4 - intl-thread-locale.m4 - intldir.m4 - intmax.m4 - inttypes_h.m4 - inttypes-pri.m4 - lcmessage.m4 - lock.m4 - longlong.m4 - printf-posix.m4 - size_max.m4 - stdint_h.m4 - threadlib.m4 - uintmax_t.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