update to gettext 0.17

[Bruno Haible]

gettext 0.17 will be released in a few hours. This time I upgrade
gnulib before making the release; it may break your automatic builds.
(The alternative would be to create a branch in the public repository,
but, hey, Jim doesn't want merge commits in the public repository.)


2007-11-07  Bruno Haible  <address@hidden>

        Update to GNU gettext 0.17.
        * m4/intl.m4: Update to GNU gettext 0.17.
        * m4/po.m4: Likewise.
        * modules/gettext (Files): Remove m4/ulonglong.m4.
        (configure.ac): Require gettext infrastructure from version 0.17.

*** modules/gettext.orig        2007-11-07 02:05:27.000000000 +0100
--- modules/gettext     2007-11-07 02:04:09.000000000 +0100
***************
*** 24,30 ****
  m4/size_max.m4
  m4/stdint_h.m4
  m4/uintmax_t.m4
- m4/ulonglong.m4
  m4/visibility.m4
  m4/wchar_t.m4
  m4/wint_t.m4
--- 24,29 ----
***************
*** 38,44 ****
  
  configure.ac:
  AM_GNU_GETTEXT([external])
! AM_GNU_GETTEXT_VERSION([0.16.1])
  
  Makefile.am:
  # This is for those projects which use "gettextize --intl" to put a 
source-code
--- 37,43 ----
  
  configure.ac:
  AM_GNU_GETTEXT([external])
! AM_GNU_GETTEXT_VERSION([0.17])
  
  Makefile.am:
  # This is for those projects which use "gettextize --intl" to put a 
source-code
*** m4/intl.m4.orig     2007-11-07 02:05:27.000000000 +0100
--- m4/intl.m4  2007-10-28 17:20:28.000000000 +0100
***************
*** 1,4 ****
! # intl.m4 serial 5 (gettext-0.16.2)
  dnl Copyright (C) 1995-2007 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 ----
! # intl.m4 serial 8 (gettext-0.17)
  dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
***************
*** 97,103 ****
    dnl    exported variables _also_ in the static library.
    if test "$enable_shared" = yes; then
      case "$host_os" in
!       cygwin*) is_woe32dll=yes ;;
        *) is_woe32dll=no ;;
      esac
    else
--- 97,103 ----
    dnl    exported variables _also_ in the static library.
    if test "$enable_shared" = yes; then
      case "$host_os" in
!       mingw* | cygwin*) is_woe32dll=yes ;;
        *) is_woe32dll=no ;;
      esac
    else
***************
*** 119,124 ****
--- 119,136 ----
      AC_CHECK_TOOL([WINDRES], [windres])
    fi
  
+   dnl Determine whether when creating a library, "-lc" should be passed to
+   dnl libtool or not. On many platforms, it is required for the libtool option
+   dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
+   dnl in the *.la files - makes it impossible to create multithreaded 
programs,
+   dnl because libtool also reorders the -lc to come before the -pthread, and
+   dnl this disables pthread_create() 
<http://docs.hp.com/en/1896/pthreads.html>.
+   case "$host_os" in
+     hpux*) LTLIBC="" ;;
+     *)     LTLIBC="-lc" ;;
+   esac
+   AC_SUBST([LTLIBC])
+ 
    dnl Rename some macros and functions used for locking.
    AH_BOTTOM([
  #define __libc_lock_t                   gl_lock_t
***************
*** 209,215 ****
    AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
      [AC_TRY_LINK([#include <langinfo.h>
  #include <locale.h>],
!       [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
        gt_cv_nl_locale_name=yes,
        gt_cv_nl_locale_name=no)
      ])
--- 221,229 ----
    AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
      [AC_TRY_LINK([#include <langinfo.h>
  #include <locale.h>],
!       [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));
!        return !cs;
!       ],
        gt_cv_nl_locale_name=yes,
        gt_cv_nl_locale_name=no)
      ])
*** m4/po.m4.orig       2007-11-07 02:05:27.000000000 +0100
--- m4/po.m4    2007-10-28 19:29:50.000000000 +0100
***************
*** 1,5 ****
! # po.m4 serial 13 (gettext-0.15)
! 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,
  dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # po.m4 serial 15 (gettext-0.17)
! dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
***************
*** 27,32 ****
--- 27,36 ----
    AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
    AC_REQUIRE([AM_NLS])dnl
  
+   dnl Release version of the gettext macros. This is used to ensure that
+   dnl the gettext macros and po/Makefile.in.in are in sync.
+   AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
+ 
    dnl Perform the following tests also if --disable-nls has been given,
    dnl because they are needed for "make dist" to work.
  
***************
*** 84,89 ****
--- 88,97 ----
    test -n "$localedir" || localedir='${datadir}/locale'
    AC_SUBST([localedir])
  
+   dnl Support for AM_XGETTEXT_OPTION.
+   test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+   AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+ 
    AC_CONFIG_COMMANDS([po-directories], [[
      for ac_file in $CONFIG_FILES; do
        # Support "outfile[:infile[:infile...]]"
***************
*** 426,428 ****
--- 434,449 ----
    fi
    mv "$ac_file.tmp" "$ac_file"
  ])
+ 
+ dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+ AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+ [
+   XGETTEXT_EXTRA_OPTIONS=
+ ])
+ 
+ dnl Registers an option to be passed to xgettext in the po subdirectory.
+ AC_DEFUN([AM_XGETTEXT_OPTION],
+ [
+   AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+ ])