Use a more robust syntax for describing the gettext version in configure.in.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f62db2fbdc82916d87e61b3dceea85b41bade847..39879f8f1de67ec1abba23f3251fdcee60b3ef82 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-11  Bruno Haible  <bruno@clisp.org>
+
+       * autopoint.texi: Recommend AM_GNU_GETTEXT_VERSION(..) syntax.
+       * gettext.texi (AM_GNU_GETTEXT_VERSION): New subsection.
+
 2002-05-08  Bruno Haible  <bruno@clisp.org>
 
        * matrix.texi: Update.

diff --git a/doc/autopoint.texi b/doc/autopoint.texi
index 7c726a19dd15f56f963fd1681c47b8360867652c..a2827edb198d7bcf39d1b66b17dbc71741ee46ff 100644 (file)
--- a/doc/autopoint.texi
+++ b/doc/autopoint.texi
@@ -5,8 +5,8 @@ autopoint [@var{option}]...
 @end example
 
 The @code{autopoint} program copies standard gettext infrastructure files
-into a source package.  It extracts from an assignment of the form
-@code{GETTEXT_VERSION=@var{version}}, found in the package's
+into a source package.  It extracts from a macro call of the form
+@code{AM_GNU_GETTEXT_VERSION(@var{version})}, found in the package's
 @file{configure.in} or @file{configure.ac} file, the gettext version
 used by the package, and copies the infrastructure files belonging to
 this version into the package.

diff --git a/doc/gettext.texi b/doc/gettext.texi
index c0e4d379b32f3fdf4cb917ec8e4c6b785e549968..085a5e761041c392542025d2db611dceab05891e 100644 (file)
--- a/doc/gettext.texi
+++ b/doc/gettext.texi
@@ -287,6 +287,7 @@ Files You Must Create or Alter
 Autoconf macros for use in @file{configure.in}
 
 * AM_GNU_GETTEXT::              AM_GNU_GETTEXT in @file{gettext.m4}
+* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in @file{gettext.m4}
 * AM_ICONV::                    AM_ICONV in @file{iconv.m4}
 
 Integrating with CVS
@@ -6242,10 +6243,11 @@ The primary macro is, of course, @code{AM_GNU_GETTEXT}.
 
 @menu
 * AM_GNU_GETTEXT::              AM_GNU_GETTEXT in @file{gettext.m4}
+* AM_GNU_GETTEXT_VERSION::      AM_GNU_GETTEXT_VERSION in @file{gettext.m4}
 * AM_ICONV::                    AM_ICONV in @file{iconv.m4}
 @end menu
 
-@node AM_GNU_GETTEXT, AM_ICONV, autoconf macros, autoconf macros
+@node AM_GNU_GETTEXT, AM_GNU_GETTEXT_VERSION, autoconf macros, autoconf macros
 @subsection AM_GNU_GETTEXT in @file{gettext.m4}
 
 @amindex AM_GNU_GETTEXT
@@ -6325,7 +6327,17 @@ linker options needed to use iconv and appends them to the @code{LIBINTL}
 and @code{LTLIBINTL} variables.
 @end itemize
 
-@node AM_ICONV,  , AM_GNU_GETTEXT, autoconf macros
+@node AM_GNU_GETTEXT_VERSION, AM_ICONV, AM_GNU_GETTEXT, autoconf macros
+@subsection AM_GNU_GETTEXT_VERSION in @file{gettext.m4}
+
+@amindex AM_GNU_GETTEXT_VERSION
+The @code{AM_GNU_GETTEXT_VERSION} macro declares the version number of
+the GNU gettext infrastructure that is used by the package.
+
+The use of this macro is optional; only the @code{autopoint} program makes
+use of it (@pxref{CVS Issues}).
+
+@node AM_ICONV,  , AM_GNU_GETTEXT_VERSION, autoconf macros
 @subsection AM_ICONV in @file{iconv.m4}
 
 @amindex AM_ICONV

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 219829be06862e3eca50d728379ea0985b222f5a..a1a9873462c4215038ec3e975ecc8e2eedb66c2a 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-11  Bruno Haible  <bruno@clisp.org>
+
+       * autopoint.in: Recognize AM_GNU_GETTEXT_VERSION(..) syntax.
+       * gettextize.in: Likewise.
+
 2002-05-03  Bruno Haible  <bruno@clisp.org>
 
        * autopoint.in: Unset all other environment variables which influence

diff --git a/misc/autopoint.in b/misc/autopoint.in
index a3d5aef4a508bc7b95405e70698003ad3e46850b..c889d3bae9903907f88cea803574ab371bfd60b8 100644 (file)
--- a/misc/autopoint.in
+++ b/misc/autopoint.in
@@ -138,7 +138,7 @@ fi
 
 # Check whether the -V option and the version number in configure.in match.
 # At least one of the two must be given. If both are given, they must agree.
-xver=`cat "$configure_in" | grep '^GETTEXT_VERSION=' | sed -e 's/^GETTEXT_VERSION=\([-+_.0-9A-Za-z]*\).*/\1/' | sed -e 1q`
+xver=`cat "$configure_in" | grep '^AM_GNU_GETTEXT_VERSION(' | sed -e 's/^AM_GNU_GETTEXT_VERSION(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
 if test -z "$xver" && test -f intl/VERSION; then
   xver=`cat intl/VERSION | sed -n -e 's/^.*gettext-\(-+_.0-9A-Za-z]*\).*$/\1/p'`
 fi
@@ -152,7 +152,7 @@ if test -n "$xver"; then
   fi
 else
   if test -z "$ver"; then
-    func_fatal_error "Missing version: please specify in $configure_in through a line 'GETTEXT_VERSION=x.yy.zz' the gettext version the package is using"
+    func_fatal_error "Missing version: please specify in $configure_in through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using"
   fi
 fi
 

diff --git a/misc/gettextize.in b/misc/gettextize.in
index 81a24b28076a20d93a47ecfe351d8edbdb209fd2..c4b206f8e0438af8548a8749b679f948fac57c7b 100644 (file)
--- a/misc/gettextize.in
+++ b/misc/gettextize.in
@@ -867,8 +867,8 @@ sed -e 's%sed -e "/POTFILES =/r po/POTFILES" po/Makefile\.in > po/Makefile *;* *
 func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
 sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
 func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
-sed -e 's/^GETTEXT_VERSION=\([-+_.0-9A-Za-z]*\)/GETTEXT_VERSION='"$version"'/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(GETTEXT_VERSION): Bump to $version."
+sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION('"$version"'/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
+func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
 $do_changelog && func_ChangeLog_finish
 
 # Recommend replacement for deprecated Makefile variables.