From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Nov 2018 12:49:30 +0000 (+0100)
Subject: gettextize: Install also host-cpu-c-abi.m4 (needed since 2018-03-24).
X-Git-Tag: v0.20~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=602113a471463872c5a3a27b36f8d7facb0d0ef6;p=thirdparty%2Fgettext.git

gettextize: Install also host-cpu-c-abi.m4 (needed since 2018-03-24).

* gettext-tools/m4/Makefile.am (aclocal_DATA): Install host-cpu-c-abi.m4.
* PACKAGING: Mention host-cpu-c-abi.m4.
* gettext-tools/misc/gettextize.in (m4filelist): Add host-cpu-c-abi.m4.
* gettext-tools/doc/gettext.texi (aclocal): Mention host-cpu-c-abi.m4.
---

diff --git a/PACKAGING b/PACKAGING
index f189682fc..13fa64b9a 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -121,6 +121,7 @@ following file list.
       $prefix/share/gettext/archive.cvs.tar.*   (only installed if --with-cvs specified)
       $prefix/share/gettext-$VERSION/its/*
       $prefix/share/aclocal/gettext.m4
+      $prefix/share/aclocal/host-cpu-c-abi.m4
       $prefix/share/aclocal/iconv.m4
       $prefix/share/aclocal/intlmacosx.m4
       $prefix/share/aclocal/lib-ld.m4
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 864c4013b..44c07550b 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -8002,9 +8002,10 @@ more.  You can remove it.
 
 If you do not have an @file{aclocal.m4} file in your distribution,
 the simplest is to concatenate 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 into a single file.
+@file{host-cpu-c-abi.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 into a single file.
 
 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
@@ -8016,10 +8017,11 @@ Their contents may vary as we get more experience with strange systems
 out there.
 
 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
+to copy the files @file{gettext.m4}, @file{host-cpu-c-abi.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 9f6408a5b..c648369f9 100644
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -4,6 +4,7 @@
 
 aclocaldir = @aclocaldir@
 aclocal_DATA = \
+  ../../gettext-runtime/gnulib-m4/host-cpu-c-abi.m4 \
   ../../gettext-runtime/gnulib-m4/lib-ld.m4 \
   ../../gettext-runtime/gnulib-m4/lib-link.m4 \
   ../../gettext-runtime/gnulib-m4/lib-prefix.m4 \
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index e390df29e..8fd96f869 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -796,6 +796,7 @@ done
 
 m4filelist='
   gettext.m4
+  host-cpu-c-abi.m4
   iconv.m4
   intlmacosx.m4
   lib-ld.m4 lib-link.m4 lib-prefix.m4