Deprecate AM_GNU_GETTEXT without external and gettextize --intl.

diff --git a/ChangeLog b/ChangeLog
index 3a8948a9faf7667b784787e49ac6ac344713f383..49284b11f7b67e266423fdb3297cec41907fc115 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-28  Bruno Haible  <bruno@clisp.org>
+
+       * NEWS: Deprecate the use of AM_GNU_GETTEXT with 'no-libtool' argument
+       and 'gettextize --intl'.
+
 2010-03-28  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add fnmatch, remove

diff --git a/NEWS b/NEWS
index 1d3a4e07073392c996c17b80c795e4bc8884214c..b1e99936b768889b3f146472ec6191ac9b8087de 100644 (file)
--- 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 2bd7b9dfd1a55aeec140fcbccb116a4d65823464..c6338105f0636270b742f8c6cfd3c53bcb83c9c2 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-28  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.m4 (AM_GNU_GETTEXT): Emit a warning if the first argument is
+       empty or 'no-libtool'.
+
 2009-12-26  Bruno Haible  <bruno@clisp.org>
 
        * 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 d90c85008aabf427d0cd2847fffbfe10eb866926..f84e6a5d753e7971dc0c827fcc7cd9956971071b 100644 (file)
--- 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 <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
+dnl   Bruno Haible <haible@clisp.cons.org>, 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 81f3cb7f8ca777d146880831ff3be2a8be568f6c..f069e21ce60cb7f09bab5b69c0cdecc7e21e55b0 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-28  Bruno Haible  <bruno@clisp.org>
+
+       * gettexize.in: Warn about use of --intl option.
+       (func_usage): Mark it as deprecated.
+       (func_version): Bump copyright year.
+
 2009-12-25  Bruno Haible  <bruno@clisp.org>
 
        * 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 14344a45d04d0d949dd0df7fe1a1fe611afb034b..c5ee610142851b1df809769010c2faf155182748 100644 (file)
--- 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 <bug-gnu-gettext@gnu.org>."
 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 <http://gnu.org/licenses/gpl.html>
 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