Re: gettext.m4 bug (was: coreutils-6.5 released (stable))

[Bruno Haible]

Andreas Schwab <address@hidden> wrote:
> > NLS configuration is broken.

Thanks for reporting this. Your patch works, but I'm applying a different
patch, for maintainability reasons.

> Well, I'm confident that the coreutils part was stable.
> It'd sure be nice to keep gnulib's instability from affecting
> "stable" coreutils releases.

Gnulib's instability was not the culprit this time; gnulib contains
the gettext.m4 from the newest supposedly stable gettext release. It's
a plain gettext.m4 bug that crept in although I tested it in gettext
on several platforms and in GNU hello.

You can sidestep gnulib instability during the latest days of testing of a
release by using a gnulib snapshot of a fixed day, when you start testing
your release, and not update this cvs checkout until you're done with the
release. It's rare that a blatant bug stays in gnulib for more than a week;
this way you protect yourself against short-lived bugs.


2006-11-20  Bruno Haible  <address@hidden>

        * gettext.m4 (AM_GNU_GETTEXT): Revert 2005-07-28 patch: Use
        changequote instead of pairs of brackets.
        Reported by Andreas Schwab <address@hidden>.

diff -r -c3 --exclude='*.po*' --exclude='*.info*' --exclude='*_*.html' 
--exclude='*.*.html' --exclude='*.[13]' --exclude='*.1.in' 
--exclude=Makefile.in --exclude=aclocal.m4 --exclude=configure 
--exclude=config.h.in --exclude=version.texi --exclude=stamp-vti 
--exclude='po-*-gen*.[ch]' --exclude='*.o' --exclude='*.lo' --exclude='*.gmo' 
--exclude=ABOUT-NLS --exclude=gnulib-lib --exclude=gnulib-m4 
--exclude=Makefile.gnulib --exclude='javadoc[12]' --exclude=CVS 
gettext-cvs/gettext-runtime/m4/gettext.m4 
gettext-6/gettext-runtime/m4/gettext.m4
*** gettext-cvs/gettext-runtime/m4/gettext.m4   Thu Oct 26 00:06:11 2006
--- gettext-6/gettext-runtime/m4/gettext.m4     Mon Nov 20 22:25:11 2006
***************
*** 1,4 ****
! # gettext.m4 serial 58 (gettext-0.16)
  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,
--- 1,4 ----
! # gettext.m4 serial 59 (gettext-0.16.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,
***************
*** 137,148 ****
          dnl to fall back to GNU NLS library.
  
          if test $gt_api_version -ge 3; then
!           gt_revision_test_code='[[
  #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
  #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
  #endif
  typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
! ]]'
          else
            gt_revision_test_code=
          fi
--- 137,150 ----
          dnl to fall back to GNU NLS library.
  
          if test $gt_api_version -ge 3; then
!           gt_revision_test_code='
  #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
  #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
  #endif
+ changequote(,)dnl
  typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
! changequote([,])dnl
! '
          else
            gt_revision_test_code=
          fi