Re: support of gettext 0.15.1

[Bruno Haible]

Hi,

About this one:

> In gettext-0.15.1 a new macro will be added, AM_GNU_GETTEXT_INTL_SUBDIR.
> Its effect is to override the first argument of AM_GNU_GETTEXT:
> 
>    The `AM_GNU_GETTEXT_INTL_SUBDIR' macro specifies that the
>    `AM_GNU_GETTEXT' macro, although invoked with the first argument
>    `external', should also prepare for building the `intl/' subdirectory.
> 
> Its purpose is to decouple the specification that gettext is needed from the
> specification how it's provided. Needed for gnulib in particular.
> 
> Automake-1.9b, however, gives an error in this situation:
> 
>    Makefile.am:30: `intl' should not be in SUBDIRS when 
> AM_GNU_GETTEXT([external]) is used
> 
> Here is a patch for automake to support this macro.

Ralf Wildenhues mentions that a test is needed. The test could work
like this (cf. gettext.test, gettext2.test):
  - Require a gettext version >= 0.15.1 or alternatively a gettext which
    defines the AM_GNU_GETTEXT_INTL_SUBDIR macro.
  - cat >>configure.in <<END
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_INTL_SUBDIR
AC_OUTPUT
END

  - mkdir po
    but not intl
  - echo 'SUBDIRS = po' > Makefile.am
  - Verify that in this setting automake fails (it should expect intl in
    SUBDIRS or mention the missing intl directory).
  - mkdir intl
  - Verify that in this setting automake fails (it should expect intl in
    SUBDIRS).
  - echo 'SUBDIRS = po intl' > Makefile.am
  - Verify that in this setting automake succeeds.

Also here is a doc update (the doc already was out of date, not mentioning
the 'external' argument).

*** automake.texi       28 Aug 2006 16:04:24 -0000      1.150
--- automake.texi       9 Oct 2006 21:04:02 -0000
***************
*** 7248,7254 ****
  (@pxref{GNU Gettext, , , gettext, GNU gettext utilities}).
  
  The @code{gettext} support in Automake requires the addition of two
! subdirectories to the package, @file{intl} and @file{po}.  Automake
  insures that these directories exist and are mentioned in
  @code{SUBDIRS}.
  
--- 7248,7256 ----
  (@pxref{GNU Gettext, , , gettext, GNU gettext utilities}).
  
  The @code{gettext} support in Automake requires the addition of two
! subdirectories to the package, @file{po} and, if @code{AM_GNU_GETTEXT}
! is not invoked with the @samp{external} argument, or if
! @code{AM_GNU_GETTEXT_INTL_SUBDIR} is used, also @file{intl}.  Automake
  insures that these directories exist and are mentioned in
  @code{SUBDIRS}.
  

Bruno