From: Bruno Haible <bruno@clisp.org>
Date: Sat, 15 Jul 2017 10:35:57 +0000 (+0200)
Subject: Fix bug: gettextize does not add intlmacosx.m4 file.
X-Git-Tag: v0.20~457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22005c5fd27c1a590bd3c7ee66bee2971f1b6860;p=thirdparty%2Fgettext.git

Fix bug: gettextize does not add intlmacosx.m4 file.

Reported by Eli Zaretskii via Gavin Smith in
<http://lists.gnu.org/archive/html/bug-texinfo/2017-07/msg00026.html>.

* gettext-tools/misc/gettextize.in (m4filelist): Include intlmacosx.m4 also
when --intl option is not given.
* gettext-tools/doc/gettext.texi (aclocal): Add intlmacosx.m4 to file list.
---

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 901c418b6..518a607ed 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -8022,8 +8022,8 @@ the simplest is to concatenate the files @file{codeset.m4}, @file{fcntl-o.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{intl/} directory, only @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} need to be concatenated.
 
 If you are not using GNU @code{automake} 1.8 or newer, you will need to
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 056461973..60df1a3ea 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 1995-1998, 2000-2016 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2017 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -826,18 +826,42 @@ if (aclocal --version) >/dev/null 2>/dev/null; then
   esac
 fi
 
-m4filelist='gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4
- po.m4 progtest.m4'
+m4filelist='
+  gettext.m4
+  iconv.m4
+  intlmacosx.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 intldir.m4, intl.m4 and its dependencies.
-  m4filelist=$m4filelist' codeset.m4 fcntl-o.m4 glibc2.m4 glibc21.m4 intdiv0.m4
-   intl.m4 intldir.m4 intlmacosx.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'
+  m4filelist=$m4filelist'
+    codeset.m4
+    fcntl-o.m4
+    glibc2.m4
+    glibc21.m4
+    intdiv0.m4
+    intl.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