New macro AM_GNU_GETTEXT_INTL_SUBDIR.

diff --git a/ChangeLog b/ChangeLog
index afdf822d3b8bac8080086ec2159c9569a964de7b..e020b3ca3c55da31806deabe5a0f2cefdbeb8260 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-01  Bruno Haible  <bruno@clisp.org>
+
+       * PACKAGING: Mention intldir.m4.
+
 2006-09-18  Bruno Haible  <bruno@clisp.org>
 
        * PACKAGING: Remove inttypes-h.m4.

diff --git a/PACKAGING b/PACKAGING
index 202297321c695f533c58c6cf1f887a0325555e39..46a391ffe77854dc2284e877019bb0cf64df975d 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -122,6 +122,7 @@ following file list.
       $prefix/share/aclocal/iconv.m4
       $prefix/share/aclocal/intdiv0.m4
       $prefix/share/aclocal/intl.m4
+      $prefix/share/aclocal/intldir.m4
       $prefix/share/aclocal/intmax.m4
       $prefix/share/aclocal/inttypes_h.m4
       $prefix/share/aclocal/inttypes-pri.m4

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 7761a23f1ee6208026189a372527f98cd08222e5..e82aee91bf02892f56c4c1629b97833d6c8adbd7 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-01  Bruno Haible  <bruno@clisp.org>
+
+       * intldir.m4: New file.
+       * gettext.m4 (AM_GNU_GETTEXT): Define gt_included_intl to yes if
+       AM_GNU_GETTEXT_INTL_SUBDIR is present among the macros selected by
+       aclocal.
+       * Makefile.am (EXTRA_DIST): Add intl.m4, intldir.m4.
+
 2006-09-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * intmax.m4 (gt_TYPE_INTMAX_T): Avoid unused variables warning.

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index 0cc4d40ce9b32382916e7ac5c5011af9798f0618..81996e945dc796a046be27df2b399de4670df0ae 100644 (file)
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -10,6 +10,8 @@ glibc2.m4 \
 glibc21.m4 \
 iconv.m4 \
 intdiv0.m4 \
+intl.m4 \
+intldir.m4 \
 intmax.m4 \
 inttypes-h.m4 \
 inttypes-pri.m4 \

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 1f229c14410b58556cb226056462daf315e3c3cc..17ab4185f9ebe3ae70df3822feb42162a09dc8a9 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 55 (gettext-0.15.1)
+# gettext.m4 serial 56 (gettext-0.15.1)
 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,10 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
-  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
   define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index f7331bbbc9e103e4b3594abb4b64d2e1b7be1fe9..31ff643fffa7b78fe37e2e02b69cc7e8dc92806b 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-01  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (aclocal): Mention intldir.m4.
+       (AM_GNU_GETTEXT): Mention the effect of AM_GNU_GETTEXT_INTL_SUBDIR.
+       (AM_GNU_GETTEXT_INTL_SUBDIR): New subsection.
+
 2006-09-18  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (aclocal): Don't mention inttypes-h.m4.

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 860dd0468a7f30a6f7fd278c95db1ffa490dd84b..e4f7954f13f0ab945c74bf5442c55c5f5021aa41 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -336,6 +336,7 @@ Autoconf macros for use in @file{configure.in}
 
 * AM_GNU_GETTEXT::              AM_GNU_GETTEXT in @file{gettext.m4}
 * AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in @file{gettext.m4}
+* AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4}
 * AM_PO_SUBDIRS::               AM_PO_SUBDIRS in @file{po.m4}
 * AM_ICONV::                    AM_ICONV in @file{iconv.m4}
 
@@ -6944,8 +6945,8 @@ automake 1.9.
 If you do not have an @file{aclocal.m4} file in your distribution,
 the simplest is to concatenate the files @file{codeset.m4},
 @file{gettext.m4}, @file{glibc2.m4}, @file{glibc21.m4}, @file{iconv.m4},
-@file{intdiv0.m4}, @file{intl.m4}, @file{intmax.m4}, @file{inttypes_h.m4},
-@file{inttypes-pri.m4}, @file{lcmessage.m4},
+@file{intdiv0.m4}, @file{intl.m4}, @file{intldir.m4}, @file{intmax.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{nls.m4}, @file{po.m4},
 @file{printf-posix.m4}, @file{progtest.m4}, @file{size_max.m4},
@@ -7341,6 +7342,7 @@ The primary macro is, of course, @code{AM_GNU_GETTEXT}.
 @menu
 * AM_GNU_GETTEXT::              AM_GNU_GETTEXT in @file{gettext.m4}
 * AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in @file{gettext.m4}
+* AM_GNU_GETTEXT_INTL_SUBDIR::  AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4}
 * AM_PO_SUBDIRS::               AM_PO_SUBDIRS in @file{po.m4}
 * AM_ICONV::                    AM_ICONV in @file{iconv.m4}
 @end menu
@@ -7368,10 +7370,13 @@ AM_GNU_GETTEXT([@var{intlsymbol}], [@var{needsymbol}], [@var{intldir}])
 @c then it is in order to install shared libraries that depend on libintl.)
 @var{intlsymbol} can be @samp{external} or @samp{no-libtool}.  The default
 (if it is not specified or empty) is @samp{no-libtool}.  @var{intlsymbol}
-should be @samp{external} for packages with no @file{intl/} directory,
-and @samp{no-libtool} for packages with an @file{intl/} directory.  In
-the latter case, a static library @code{$(top_builddir)/intl/libintl.a}
-will be created.
+should be @samp{external} for packages with no @file{intl/} directory.
+For packages with an @file{intl/} directory, you can either use an
+@var{intlsymbol} equal to @samp{no-libtool}, or you can use @samp{external}
+and override by using the macro @code{AM_GNU_GETTEXT_INTL_SUBDIR} elsewhere.
+The two ways to specify the existence of an @file{intl/} directory are
+equivalent.  At build time, a static library
+@code{$(top_builddir)/intl/libintl.a} will then be created.
 
 If @var{needsymbol} is specified and is @samp{need-ngettext}, then GNU
 gettext implementations (in libc or libintl) without the @code{ngettext()}
@@ -7431,7 +7436,7 @@ linker options needed to use iconv and appends them to the @code{LIBINTL}
 and @code{LTLIBINTL} variables.
 @end itemize
 
-@node AM_GNU_GETTEXT_VERSION, AM_PO_SUBDIRS, AM_GNU_GETTEXT, autoconf macros
+@node AM_GNU_GETTEXT_VERSION, AM_GNU_GETTEXT_INTL_SUBDIR, AM_GNU_GETTEXT, autoconf macros
 @subsection AM_GNU_GETTEXT_VERSION in @file{gettext.m4}
 
 @amindex AM_GNU_GETTEXT_VERSION
@@ -7441,7 +7446,22 @@ the GNU gettext infrastructure that is used by the package.
 The use of this macro is optional; only the @code{autopoint} program makes
 use of it (@pxref{CVS Issues}).
 
-@node AM_PO_SUBDIRS, AM_ICONV, AM_GNU_GETTEXT_VERSION, autoconf macros
+@node AM_GNU_GETTEXT_INTL_SUBDIR, AM_PO_SUBDIRS, AM_GNU_GETTEXT_VERSION, autoconf macros
+@subsection AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4}
+
+@amindex AM_GNU_GETTEXT_INTL_SUBDIR
+The @code{AM_GNU_GETTEXT_INTL_SUBDIR} macro specifies that the
+@code{AM_GNU_GETTEXT} macro, although invoked with the first argument
+@samp{external}, should also prepare for building the @file{intl/}
+subdirectory.
+
+The @code{AM_GNU_GETTEXT_INTL_SUBDIR} invocation can occur before or after
+the @code{AM_GNU_GETTEXT} invocation; the order doesn't matter.
+
+The use of this macro requires GNU automake 1.10 or newer and
+GNU autoconf 2.61 or newer.
+
+@node AM_PO_SUBDIRS, AM_ICONV, AM_GNU_GETTEXT_INTL_SUBDIR, autoconf macros
 @subsection AM_PO_SUBDIRS in @file{po.m4}
 
 @amindex AM_PO_SUBDIRS

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 2a61e891c3d3b91b56299926c2acbdbd6519b943..92fa89af647bc7190abb05b428f358e9e8d5117c 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-01  Bruno Haible  <bruno@clisp.org>
+
+       * hello-*/autoclean.sh: Remove also intldir.m4.
+
 2006-10-02  Bruno Haible  <bruno@clisp.org>
 
        * po/fr.po: Update from Christophe Combelles <ccomb@free.fr>.

diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
index 8bd9c209bd6519b2982781ff2b36c9d7503278b9..88d5791be480b687595df669ef2d87c0635f4947 100755 (executable)
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -17,6 +17,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh
index b55344091c3287c36f1dcb90dbe76b8d766ee36e..c2d587264b5dd3a11f6253bbe71c3f8e14962ba3 100755 (executable)
--- a/gettext-tools/examples/hello-c++-kde/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh
@@ -23,6 +23,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh
index 020c93a4b9b4639b60c9e7034ebbd0669ad66c73..94abdba72ada437a07ec4d98659664150253f8b0 100755 (executable)
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -20,6 +20,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh
index 8bd9c209bd6519b2982781ff2b36c9d7503278b9..88d5791be480b687595df669ef2d87c0635f4947 100755 (executable)
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -17,6 +17,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh
index 020c93a4b9b4639b60c9e7034ebbd0669ad66c73..94abdba72ada437a07ec4d98659664150253f8b0 100755 (executable)
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -20,6 +20,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
index 8bd9c209bd6519b2982781ff2b36c9d7503278b9..88d5791be480b687595df669ef2d87c0635f4947 100755 (executable)
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -17,6 +17,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh
index 020c93a4b9b4639b60c9e7034ebbd0669ad66c73..94abdba72ada437a07ec4d98659664150253f8b0 100755 (executable)
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -20,6 +20,7 @@ rm -f m4/glibc21.m4
 rm -f m4/iconv.m4
 rm -f m4/intdiv0.m4
 rm -f m4/intl.m4
+rm -f m4/intldir.m4
 rm -f m4/intmax.m4
 rm -f m4/inttypes-pri.m4
 rm -f m4/inttypes_h.m4

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index f6cd3310214434d80fe68e3238aaba77fa12a988..9618c59032dfb84a42c57e62b3fd22106c09f316 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-01  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (aclocal_DATA): Add intldir.m4.
+
 2006-09-18  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (aclocal_DATA): Remove inttypes-h.m4.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index a52da937221ec3abd5a2a64a23279140152b3fc9..21a4fbb88d77cbb1db73c407c680852dc36723df 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -14,6 +14,7 @@ aclocal_DATA = \
   ../../gettext-runtime/m4/iconv.m4 \
   ../../gettext-runtime/m4/intdiv0.m4 \
   ../../gettext-runtime/m4/intl.m4 \
+  ../../gettext-runtime/m4/intldir.m4 \
   ../../gettext-runtime/m4/intmax.m4 \
   ../../gettext-runtime/m4/inttypes_h.m4 \
   ../../gettext-runtime/m4/inttypes-pri.m4 \

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 52422247d6ea59e91b1f824df39223cfbb37ab2c..df30ff90758eab7a20b12ba431f15e5b68186edd 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-01  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in (m4filelist): Add intldir.m4.
+
 2006-09-18  Bruno Haible  <bruno@clisp.org>
 
        * gettextize.in (m4filelist): Remove inttypes-h.m4.

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 47258488d80668f37e62101492f652269dee5c8e..9a33b26651b5512fa3f5c2e2f2bb2c461729fd6c 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -740,11 +740,11 @@ m4filelist='gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4
 # 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.
+  # Add intldir.m4, intl.m4 and its dependencies.
   m4filelist=$m4filelist' codeset.m4 glibc2.m4 glibc21.m4 intdiv0.m4 intl.m4
-   intmax.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'
+   intldir.m4 intmax.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