From: Bruno Haible Date: Sun, 28 Mar 2010 22:08:31 +0000 (+0200) Subject: Deprecate AM_GNU_GETTEXT without external and gettextize --intl. X-Git-Tag: v0.18~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43fb2b2ca1e1577a5be61d51ecd05ea6f607e396;p=thirdparty%2Fgettext.git Deprecate AM_GNU_GETTEXT without external and gettextize --intl. --- diff --git a/ChangeLog b/ChangeLog index 3a8948a9f..49284b11f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-03-28 Bruno Haible + + * NEWS: Deprecate the use of AM_GNU_GETTEXT with 'no-libtool' argument + and 'gettextize --intl'. + 2010-03-28 Bruno Haible * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add fnmatch, remove diff --git a/NEWS b/NEWS index 1d3a4e070..b1e99936b 100644 --- a/NEWS +++ b/NEWS @@ -52,6 +52,12 @@ Version 0.18 - January 2008 * The po/Makevars file has a new field MSGMERGE_OPTIONS, that can be used to adjust msgmerge's operation. +* The use of the macro AM_GNU_GETTEXT without 'external' argument and the + --intl option of the gettextize program are deprecated and will be removed + in the next release. Instead of including the intl sources in your package, + we suggest making the libintl library an (optional) prerequisite of your + package. + * Updated the meaning of 'gcc-internal-format' to match GCC 4.3. * Installation options: diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 2bd7b9dfd..c6338105f 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,8 @@ +2010-03-28 Bruno Haible + + * gettext.m4 (AM_GNU_GETTEXT): Emit a warning if the first argument is + empty or 'no-libtool'. + 2009-12-26 Bruno Haible * intl.m4 (gt_INTL_SUBDIR_CORE): Don't check for NL_LOCALE_NAME macro. diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index d90c85008..f84e6a5d7 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 62 (gettext-0.18) -dnl Copyright (C) 1995-2009 Free Software Foundation, Inc. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 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. @@ -15,7 +15,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006. +dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 81f3cb7f8..f069e21ce 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,9 @@ +2010-03-28 Bruno Haible + + * gettexize.in: Warn about use of --intl option. + (func_usage): Mark it as deprecated. + (func_version): Bump copyright year. + 2009-12-25 Bruno Haible * gettextize.in (m4filelist): Add fcntl-o.m4 instead of fcntl_h.m4 to diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 14344a45d..c5ee61014 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1995-1998, 2000-2009 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -160,7 +160,7 @@ Options: --help print this help and exit --version print version information and exit -f, --force force writing of new files even if old exist - --intl install libintl in a subdirectory + --intl install libintl in a subdirectory (deprecated) --po-dir=DIR specify directory with PO files --no-changelog don't update or create ChangeLog files --symlink make symbolic links instead of copying files @@ -174,7 +174,7 @@ Report bugs to ." func_version () { echo "$progname (GNU $package) $version" - echo "Copyright (C) 1995-1998, 2000-2009 Free Software Foundation, Inc. + echo "Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law." @@ -261,6 +261,11 @@ func_fatal_error () test -n "$podirs" || podirs="po" } +# Warn about deprecated options. +if test -n "$intldir"; then + echo "gettextize: warning: the option '--intl' is deprecated and will be removed" 1>&2 +fi + # Command-line argument processing. # Analyzes the remaining arguments. # Sets the variables