[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-gnulib] update module 'gettext' from GNU gettext
|
From: |
Bruno Haible |
|
Subject: |
[bug-gnulib] update module 'gettext' from GNU gettext |
|
Date: |
Thu, 24 Feb 2005 21:05:40 +0100 |
|
User-agent: |
KMail/1.5 |
Hi,
I updated the module 'gettext' from GNU gettext 0.14.2.
Bruno
2004-11-23 Bruno Haible <address@hidden>
* gettext.h [!ENABLE_NLS]: When using GNU libstdc++, include
<libintl.h> early.
Reported by Peter Breitenlohner <address@hidden>.
2005-01-19 Bruno Haible <address@hidden>
* lib-ld.m4, lib-link.m4, lib-prefix.m4: Use an all-permissive
copyright notice, recommended by RMS.
2004-07-13 Robert Millan <address@hidden>
* lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Same /usr/local/include handling
on Hurd and on GNU/k*BSD as on Linux.
* lib-prefix.m4 (AC_LIB_PREFIX): Likewise.
2005-01-29 Bruno Haible <address@hidden>
* gettext.m4 (gt_INTL_MACOSX): New macro, extracted from
AM_INTL_SUBDIR. Set INTL_MACOSX_LIBS instead of INTL_MACOSX_LDFLAGS.
(AM_GNU_GETTEXT): Invoke it. Add the INTL_MACOSX_LIBS contents to
LIBINTL and LTLIBINTL.
(AM_INTL_SUBDIR): Require gt_INTL_MACOSX.
2005-01-19 Bruno Haible <address@hidden>
* gettext.m4, intdiv0.m4, intmax.m4, inttypes-pri.m4, lcmessage.m4:
* nls.m4, po.m4, printf-posix.m4, progtest.m4:
Use an all-permissive copyright notice, recommended by RMS.
2005-01-10 Bruno Haible <address@hidden>
* gettext.m4 (AM_GNU_GETTEXT): Declare _nl_expand_alias with an
argument.
Reported by Mark A. Wicks <address@hidden> and
Vaclav Haisman <address@hidden>.
2005-01-08 Bruno Haible <address@hidden>
* progtest.m4: Require autoconf >= 2.50.
(AM_PATH_PROG_WITH_TEST): Emit some traces to the log file.
* po.m4: Require autoconf >= 2.50.
(AM_PO_SUBDIRS): Emit the tested program's output to the log file.
Suggested by Yann Dirson <address@hidden>.
2004-09-05 Bruno Haible <address@hidden>
* gettext.m4 (AM_INTL_SUBDIR): Test for CFPreferencesCopyAppValue.
2004-09-03 Bruno Haible <address@hidden>
* gettext.m4 (AM_INTL_SUBDIR): Add a test for CFLocaleCopyCurrent.
2004-05-16 Bruno Haible <address@hidden>
* lcmessage.m4 (gt_LC_MESSAGES): Renamed from AM_LC_MESSAGES.
* gettext.m4 (AM_INTL_SUBDIR): Update.
Suggested by Alexandre Duret-Lutz.
2004-04-19 Bruno Haible <address@hidden>
* gettext.m4: Change jm_ to gl_ in AC_DEFINE'd names. Update all uses.
2004-03-02 Bruno Haible <address@hidden>
* po.m4 (AM_POSTPROCESS_PO_MAKEFILE): For RESOURCESDLLFILES and
CSHARPCATALOGS, extend the lang -> frobbedlang mapping so as to support
Serbian and Uzbek locales.
2004-02-02 Bruno Haible <address@hidden>
* glibc2.m4: New file.
* gettext.m4 (AM_INTL_SUBDIR): Require gt_GLIBC2.
*** gettext.h 2003-07-17 12:37:44.000000000 +0200
--- gettext-0.14.2/gettext-tools/lib/gettext.h 2004-11-23 18:52:02.000000000
+0100
***************
*** 36,41 ****
--- 37,52 ----
# include <locale.h>
#endif
+ /* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+ <libintl.h>, which chokes if dcgettext is defined as a macro. So include
+ it now, to make later inclusions of <libintl.h> a NOP. */
+ #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+ # include <cstdlib>
+ # if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+ # include <libintl.h>
+ # endif
+ #endif
+
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
for invalid uses of the value returned from these functions.
*** gettext.m4 2004-04-19 13:34:45.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/gettext.m4 2005-01-29
16:08:58.000000000 +0100
***************
*** 1,10 ****
! # gettext.m4 serial 29
! dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # gettext.m4 serial 34 (gettext-0.14.2)
! dnl Copyright (C) 1995-2005 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.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 92,97 ****
--- 90,98 ----
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ gt_INTL_MACOSX
+
dnl Set USE_NLS.
AM_NLS
***************
*** 172,180 ****
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias ();],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
dnl Now see whether libintl exists and depends on libiconv.
--- 173,181 ----
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
dnl Now see whether libintl exists and depends on libiconv.
***************
*** 193,201 ****
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias ();],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext_libintl=yes
--- 194,202 ----
#ifdef __cplusplus
"C"
#endif
! const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext_libintl=yes
***************
*** 245,250 ****
--- 246,260 ----
fi
])
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Some extra flags are needed during linking.
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
AC_DEFINE(ENABLE_NLS, 1,
***************
*** 350,355 ****
--- 360,366 ----
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([gt_GLIBC2])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
***************
*** 374,379 ****
--- 385,391 ----
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_REQUIRE([gl_XSIZE])dnl
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
AC_CHECK_TYPE([ptrdiff_t], ,
[AC_DEFINE([ptrdiff_t], [long],
***************
*** 427,433 ****
AM_ICONV
AM_LANGINFO_CODESET
if test $ac_cv_header_locale_h = yes; then
! AM_LC_MESSAGES
fi
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
--- 439,449 ----
AM_ICONV
AM_LANGINFO_CODESET
if test $ac_cv_header_locale_h = yes; then
! gt_LC_MESSAGES
! fi
!
! if test -n "$INTL_MACOSX_LIBS"; then
! CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
fi
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
***************
*** 463,468 ****
--- 479,528 ----
])
+ dnl Checks for special options needed on MacOS X.
+ dnl Defines INTL_MACOSX_LIBS.
+ AC_DEFUN([gt_INTL_MACOSX],
+ [
+ dnl Check for API introduced in MacOS X 10.2.
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+ gt_cv_func_CFPreferencesCopyAppValue,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -framework CoreFoundation"
+ AC_TRY_LINK([#include <CFPreferences.h>],
+ [CFPreferencesCopyAppValue(NULL, NULL)],
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
+ fi
+ dnl Check for API introduced in MacOS X 10.3.
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -framework CoreFoundation"
+ AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
+ [gt_cv_func_CFLocaleCopyCurrent=no])
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in
the CoreFoundation framework.])
+ fi
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+ fi
+ AC_SUBST([INTL_MACOSX_LIBS])
+ ])
+
+
dnl gt_CHECK_DECL(FUNC, INCLUDES)
dnl Check whether a function is declared.
AC_DEFUN([gt_CHECK_DECL],
*** intdiv0.m4 2003-08-15 14:30:46.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/intdiv0.m4 2005-01-19
15:09:15.000000000 +0100
***************
*** 1,10 ****
# intdiv0.m4 serial 1 (gettext-0.11.3)
dnl Copyright (C) 2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
--- 1,8 ----
# intdiv0.m4 serial 1 (gettext-0.11.3)
dnl Copyright (C) 2002 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.
dnl From Bruno Haible.
*** intmax.m4 2004-04-19 13:34:46.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/intmax.m4 2005-01-19 15:09:15.000000000
+0100
***************
*** 1,10 ****
! # intmax.m4 serial 2
! dnl Copyright (C) 2002-2004 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
--- 1,8 ----
! # intmax.m4 serial 2 (gettext-0.14.2)
! dnl Copyright (C) 2002-2005 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.
dnl From Bruno Haible.
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
*** inttypes-pri.m4 2003-08-15 14:30:46.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/inttypes-pri.m4 2005-01-19
15:09:15.000000000 +0100
***************
*** 1,10 ****
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
--- 1,8 ----
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 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.
dnl From Bruno Haible.
*** lcmessage.m4 2002-06-14 14:01:39.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/lcmessage.m4 2005-01-19
15:09:15.000000000 +0100
***************
*** 1,10 ****
! # lcmessage.m4 serial 3 (gettext-0.11.3)
! dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # lcmessage.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 1995-2002, 2004-2005 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.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 20,31 ****
# Check whether LC_MESSAGES is available in <locale.h>.
! AC_DEFUN([AM_LC_MESSAGES],
[
! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
! am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
! if test $am_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
--- 18,29 ----
# Check whether LC_MESSAGES is available in <locale.h>.
! AC_DEFUN([gt_LC_MESSAGES],
[
! AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
! gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
! if test $gt_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
*** lib-link.m4 2005-01-18 13:57:38.000000000 +0100
--- gettext-0.14.2/autoconf-lib-link/m4/lib-link.m4 2005-01-19
15:02:49.000000000 +0100
***************
*** 1,5 ****
! # lib-link.m4 serial 4 (gettext-0.12)
! dnl Copyright (C) 2001-2003 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 ----
! # lib-link.m4 serial 5 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 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.
***************
*** 348,354 ****
if test "X$additional_includedir" = "X/usr/local/include";
then
if test -n "$GCC"; then
case $host_os in
! linux*) haveit=yes;;
esac
fi
fi
--- 348,354 ----
if test "X$additional_includedir" = "X/usr/local/include";
then
if test -n "$GCC"; then
case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
***************
*** 397,403 ****
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
! linux*) haveit=yes;;
esac
fi
fi
--- 397,403 ----
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
*** lib-prefix.m4 2005-01-18 13:57:41.000000000 +0100
--- gettext-0.14.2/autoconf-lib-link/m4/lib-prefix.m4 2005-01-19
15:02:49.000000000 +0100
***************
*** 1,5 ****
! # lib-prefix.m4 serial 3 (gettext-0.13)
! dnl Copyright (C) 2001-2003 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 ----
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 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.
***************
*** 69,75 ****
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
! linux*) haveit=yes;;
esac
fi
fi
--- 69,75 ----
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
! linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
*** nls.m4 2003-04-29 01:04:09.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/nls.m4 2005-01-19 15:09:15.000000000
+0100
***************
*** 1,10 ****
# nls.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
# nls.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 1995-2003 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.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
*** po.m4 2004-02-07 17:52:46.000000000 +0100
--- gettext-0.14.2/gettext-runtime/m4/po.m4 2005-01-19 15:09:15.000000000
+0100
***************
*** 1,10 ****
! # po.m4 serial 3 (gettext-0.14)
! dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # po.m4 serial 5 (gettext-0.14.2)
! dnl Copyright (C) 1995-2005 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.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 19,24 ****
--- 17,24 ----
dnl Ulrich Drepper <address@hidden>, 1995-2000.
dnl Bruno Haible <address@hidden>, 2000-2003.
+ AC_PREREQ(2.50)
+
dnl Checks for all prerequisites of the po subdirectory.
AC_DEFUN([AM_PO_SUBDIRS],
[
***************
*** 34,40 ****
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
dnl The second test excludes FreeBSD msgfmt.
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
! [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
:)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--- 34,40 ----
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
dnl The second test excludes FreeBSD msgfmt.
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
! [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
:)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
***************
*** 43,49 ****
dnl The first test excludes Solaris xgettext and early GNU xgettext
versions.
dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
! [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >/dev/null 2>&1 &&
(if $ac_dir/$ac_word --omit-header --copyright-holder=
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then
exit 1; else exit 0; fi)],
:)
dnl Remove leftover from FreeBSD xgettext call.
--- 43,49 ----
dnl The first test excludes Solaris xgettext and early GNU xgettext
versions.
dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
! [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --omit-header --copyright-holder=
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then
exit 1; else exit 0; fi)],
:)
dnl Remove leftover from FreeBSD xgettext call.
***************
*** 51,57 ****
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
! [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
dnl Test whether we really found GNU msgfmt.
--- 51,57 ----
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
! [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[
2>&1], :)
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
dnl Test whether we really found GNU msgfmt.
***************
*** 348,354 ****
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g'`
RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
--- 348,354 ----
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
***************
*** 389,395 ****
QTCATALOGS="$QTCATALOGS $lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g'`
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
done
fi
--- 389,395 ----
QTCATALOGS="$QTCATALOGS $lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
! frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
done
fi
***************
*** 409,415 ****
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
# Add dependencies that cannot be formulated as a simple suffix rule.
for lang in $ALL_LINGUAS; do
! frobbedlang=`echo $lang | sed -e 's/_/-/g'`
cat >> "$ac_file.tmp" <<EOF
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
--- 409,415 ----
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
# Add dependencies that cannot be formulated as a simple suffix rule.
for lang in $ALL_LINGUAS; do
! frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
cat >> "$ac_file.tmp" <<EOF
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
*** printf-posix.m4 2004-04-13 13:24:06.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/printf-posix.m4 2005-01-19
15:09:15.000000000 +0100
***************
*** 1,10 ****
# printf-posix.m4 serial 2 (gettext-0.13.1)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
dnl Test whether the printf() function supports POSIX/XSI format strings with
--- 1,8 ----
# printf-posix.m4 serial 2 (gettext-0.13.1)
dnl Copyright (C) 2003 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.
dnl From Bruno Haible.
dnl Test whether the printf() function supports POSIX/XSI format strings with
*** progtest.m4 2003-08-15 14:30:47.000000000 +0200
--- gettext-0.14.2/gettext-runtime/m4/progtest.m4 2005-01-19
15:09:16.000000000 +0100
***************
*** 1,10 ****
! # progtest.m4 serial 3 (gettext-0.12)
! dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License. As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
--- 1,8 ----
! # progtest.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 1996-2003, 2005 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.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
***************
*** 18,23 ****
--- 16,23 ----
dnl Authors:
dnl Ulrich Drepper <address@hidden>, 1996.
+ AC_PREREQ(2.50)
+
# Search path for a program which passes the given test.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
***************
*** 67,72 ****
--- 67,73 ----
test -z "$ac_dir" && ac_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
if [$3]; then
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
break 2
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-gnulib] update module 'gettext' from GNU gettext,
Bruno Haible <=