[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-720-g1c8d96d

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=1c8d96d3c8aee3c360d860fcfdefa1ba74747055

The branch, master has been updated
       via  1c8d96d3c8aee3c360d860fcfdefa1ba74747055 (commit)
       via  ef95da1f6a426e26b5f6b3c219ec4d27f982ffc5 (commit)
       via  1325a8ada5e11f19ff41094e8c2f86fe0952e425 (commit)
       via  b532317d8b7f779a45a070fd10012a204cf4ee72 (commit)
      from  8322f7e252c32fbe5dfac94305415cbe7c73ea34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c8d96d3c8aee3c360d860fcfdefa1ba74747055
Merge: 8322f7e ef95da1
Author: Stefano Lattarini <address@hidden>
Date:   Fri Mar 4 19:10:00 2011 +0100

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   20 +++++++++++++
 ChangeLog.03                                       |    6 ++--
 ChangeLog.96                                       |   30 ++++++++++----------
 ChangeLog.98                                       |   12 ++++----
 NEWS                                               |    4 +-
 TODO                                               |    6 ++--
 tests/Makefile.am                                  |    2 +-
 tests/Makefile.in                                  |    2 +-
 ...s-in-var-defn.test => comments-in-var-def.test} |    0
 9 files changed, 51 insertions(+), 31 deletions(-)
 rename tests/{comments-in-var-defn.test => comments-in-var-def.test} (100%)

diff --git a/ChangeLog b/ChangeLog
index 456b8b4..5b666d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-03-04  Stefano Lattarini  <address@hidden>
+
+       tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
+       * tests/comments-in-var-defn.test: The configure.in stub created
+       by default, which has the AC_INIT first argument obtained by the
+       test name, causes autoconf 2.62 to fail with a spurious error
+       message like: "configure.in:1: error: defn: undefined macro:".
+       Thus, to prevent this, the test is renamed to ...
+       * tests/comments-in-var-def.test: ... this.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-03-04  Stefano Lattarini  <address@hidden>
+
+       cosmetics: convert encoding from ISO-8859 to UTF-8
+       * ChangeLog.03: Convert encoding to UTF-8.
+       * ChangeLog.96: Likewise.
+       * ChangeLog.98: Likewise.
+       * NEWS: Likewise.
+       * TODO: Likewise.
+
 2011-03-01  Stefano Lattarini  <address@hidden>
 
        tests: extend checks on the 'unindent' shell function
diff --git a/ChangeLog.03 b/ChangeLog.03
index eb5b251..0152d56 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -67,7 +67,7 @@
 
        * tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
        Require texi2dvi-o.
-       Report from Václav Haisman.
+       Report from Václav Haisman.
 
 2003-12-10  Alexandre Duret-Lutz  <address@hidden>
 
@@ -1928,9 +1928,9 @@
 
 2003-05-22  Alexandre Duret-Lutz  <address@hidden>
 
-       * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
+       * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
 
-       * lib/elisp-comp: s/François/Franc,ois/.
+       * lib/elisp-comp: s/François/Franc,ois/.
        Suggested by Paul Eggert.
 
        * automake.in: Move the "main" code at the end.
diff --git a/ChangeLog.96 b/ChangeLog.96
index 33e6542..07f71c2 100644
--- a/ChangeLog.96
+++ b/ChangeLog.96
@@ -234,7 +234,7 @@ Sun Nov 24 00:33:50 1996  Tom Tromey  <address@hidden>
        * libtool.am (.c.lo): Set --mode=compile when running libtool.
        * progs.am: Set --mode=install when running libtool.
 
-       Fix for bug reported by François Pinard:
+       Fix for bug reported by François Pinard:
        * automake.in (do_check_merge_target): New sub.
        (do_one_merge_target): No longer handle `check'.
        (handle_merge_targets): Use do_check_merge_target.
@@ -914,7 +914,7 @@ Tue Sep  3 18:50:32 1996  Tom Tromey  <address@hidden>
        NORMAL_INSTALL defined.
 
        * m4/AM_PROG_INSTALL.m4: INSTALL_SCRIPT defaults to
-       ${INSTALL_PROGRAM}.  From François Pinard.
+       ${INSTALL_PROGRAM}.  From François Pinard.
 
 Tue Aug 27 08:25:05 1996  Tom Tromey  <address@hidden>
 
@@ -962,7 +962,7 @@ Sat Aug 24 09:30:46 1996  Tom Tromey  <address@hidden>
 
        * m4/AM_INIT_AUTOMAKE.m4: Define PACKAGE and VERSION.
 
-       * m4/AM_WITH_REGEX.m4: New version from François Pinard.
+       * m4/AM_WITH_REGEX.m4: New version from François Pinard.
 
        * m4/AM_TYPE_PTRDIFF_T.m4: Use am_cv, not ac_cv.
        * m4/AM_C_PROTOTYPES.m4: Ditto.
@@ -1222,7 +1222,7 @@ Sun Aug  4 12:52:43 1996  Tom Tromey  <address@hidden>
 
        * automake.in (handle_dist_worker): Use fgrep, not grep.
 
-       * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
+       * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
 
        * automake.in (handle_emacs_lisp): Include lisp-clean.am in
        output.
@@ -1272,7 +1272,7 @@ Sun Jul 28 11:14:52 1996  Tom Tromey  <address@hidden>
 Fri Jul 19 10:12:27 1996  Tom Tromey  <address@hidden>
 
        * automake.in (initialize_global_constants): Put ansi2knr.c and
-       ansi2knr.1 into common_files.  Bug report from François Pinard.
+       ansi2knr.1 into common_files.  Bug report from François Pinard.
 
 Mon Jul 15 10:28:29 1996  Tom Tromey  <address@hidden>
 
@@ -1730,7 +1730,7 @@ Thu Mar 14 09:28:21 1996  Tom Tromey  <address@hidden>
        * data.am (address@hidden@DATA): Allow empty list of data.
        (address@hidden@DATA): Ditto.
        * programs.am (address@hidden@PROGRAMS): Added missing semicolon.
-       From François Pinard.
+       From François Pinard.
        (address@hidden@PROGRAMS): Fixed bug when list of programs empty.
        (address@hidden@PROGRAMS): Ditto.
 
@@ -2273,7 +2273,7 @@ Fri Jan 19 00:50:29 1996  Tom Tromey  <address@hidden>
 
 Thu Jan 18 00:25:56 1996  Tom Tromey  <address@hidden>
 
-       From François Pinard:
+       From François Pinard:
        * automake.in (handle_source_transform): Transform $o file into .P
        file.
        (handle_dist_worker): Handle case where DISTFILES includes
@@ -2286,7 +2286,7 @@ Sun Jan 14 13:54:16 1996  Tom Tromey  <address@hidden>
 
        * automake.in (scan_configure): Look for NLS support.
 
-       Changes from François Pinard:
+       Changes from François Pinard:
        * texinfos.am (install-info): Correctly install when build dir is
        not srcdir.
        * tags-subd.am (ID): Indentation change.
@@ -2317,7 +2317,7 @@ Sat Jan 13 00:18:06 1996  Tom Tromey  <address@hidden>
        * texi-version.am (mostlyclean-vti): Remove version.tmp, not
        *.tmp.
 
-       * automake.in (handle_dist): Chmod distdir 777.  From François
+       * automake.in (handle_dist): Chmod distdir 777.  From François
        Pinard.
 
        * automake.in (scan_configure): New function.
@@ -2344,7 +2344,7 @@ Thu Jan 11 23:14:18 1996  Tom Tromey  <address@hidden>
 
 Tue Jan  9 11:24:14 1996  Tom Tromey  <address@hidden>
 
-       Fixes from François Pinard:
+       Fixes from François Pinard:
        * depend.am ($(srcdir)/.deps/%.P): Handle deansification.
        * automake.in (get_object_extension): Use $o, not $(kr)o.
        (handle_source_transform): Don't look for $(kr)c files.
@@ -2394,7 +2394,7 @@ Fri Jan  5 10:31:19 1996  Tom Tromey  <address@hidden>
 
        * Added copyright notice to each .am file.
 
-       * automake.in: Cleanups from François Pinard to avoid $#.
+       * automake.in: Cleanups from François Pinard to avoid $#.
        (require_argument): Fixed sense of test.
        (set_strictness): Bug fix.
 
@@ -2450,7 +2450,7 @@ Wed Jan  3 00:05:40 1996  Tom Tromey  <address@hidden>
        ABOUT-GNU.
        (check_gnu_standards): Require file COPYING.
 
-       From François Pinard:
+       From François Pinard:
        * automake.in (file_contents): Comment out "warn"s.
        (usage): Use 4 columns.
        (USAGE_FORMAT): Ditto.
@@ -2476,7 +2476,7 @@ Wed Jan  3 00:05:40 1996  Tom Tromey  <address@hidden>
 Tue Jan  2 23:33:24 1996  Tom Tromey  <address@hidden>
 
        * texinfos.am (install-info): Look in $d for info files.  From
-       François Pinard.
+       François Pinard.
 
        * depend.am ($(srcdir)/.deps/%.P): Fixed regexp.
 
@@ -2495,7 +2495,7 @@ Mon Jan  1 15:43:25 1996  Tom Tromey  <address@hidden>
        (read_am_file): Ditto.
        (do_one_clean_target): Removed spurious newline.
 
-       Some changes from François Pinard:
+       Some changes from François Pinard:
        * Removed trailing whitespace from all '.am' files.
        * tags-subd.am (ID): Use &&, not ;.
        (TAGS): Ditto.
@@ -2557,7 +2557,7 @@ Sun Dec 31 13:04:59 1995  Tom Tromey  <address@hidden>
        * automake.in (initialize_global_constants): Don't print body of
        loop at make time.
 
-       Changes from François Pinard:
+       Changes from François Pinard:
        * depend.am (MKDEP): Include DEFS, INCLUDES, CPPFLAGS, CFLAGS.
        (DEP_FILES): Put dependency files in $(srcdir).
        Look in $(srcdir) when including dependency files.
diff --git a/ChangeLog.98 b/ChangeLog.98
index bb719c3..1fcc56c 100644
--- a/ChangeLog.98
+++ b/ChangeLog.98
@@ -166,7 +166,7 @@ Fri Dec 11 10:23:17 1998  Matthew D. Langston  
<address@hidden>
 
        * Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir.
 
-       Some bugs from François Pinard:
+       Some bugs from François Pinard:
        * automake.in (usage): Remove duplicates in file list.
 
        * automake.in (usage): Print files in column-major order.
@@ -1485,7 +1485,7 @@ Sun Jun 22 14:01:59 1997  Tom Tromey  <address@hidden>
        when actually installing.  From Gord Matzigkeit.
 
        * automake.in (handle_tests): Exit status `77' means `ignore
-       test'.  From François Pinard.
+       test'.  From François Pinard.
        (handle_tests) Also, make banner same size as text.
 
        * automake.in (handle_configure): Don't handle PRE_BUILT_SOURCES.
@@ -1579,7 +1579,7 @@ Sun May 11 13:59:14 1997  Tom Tromey  <address@hidden>
        * kr-extra.am (clean-krextra): Remove ansi2knr here, not in
        distclean-krextra.
 
-       * missing: Regularized grammar.  From François Pinard.
+       * missing: Regularized grammar.  From François Pinard.
 
 Sat May 10 16:48:47 1997  Tom Tromey  <address@hidden>
 
@@ -1641,7 +1641,7 @@ Wed Apr 30 14:46:37 1997  Ian Lance Taylor  
<address@hidden>
 
 Tue Apr 29 19:11:45 1997  Tom Tromey  <address@hidden>
 
-       * INSTALL, mkinstalldirs, install-sh: Update from François
+       * INSTALL, mkinstalldirs, install-sh: Update from François
        Pinard.
 
        * aclocal.in (add_macro): If AC_ macro was defined, then mark it
@@ -2001,7 +2001,7 @@ Tue Mar 18 17:20:03 1997  Tom Tromey  <address@hidden>
        * m4/init.m4 (missing_dir): Use AM_MISSING_PROG.
        * m4/missing.m4: New file.
 
-       `missing' changes from François Pinard:
+       `missing' changes from François Pinard:
        * Everywhere: Use ACLOCAL_M4 to name aclocal.m4 file; ACLOCAL now
        names aclocal program.
        * m4/init.m4: Replace programs with `missing' if not found.
@@ -2140,7 +2140,7 @@ Tue Feb  4 18:29:42 1997  Tom Tromey  <address@hidden>
        (handle_aclocal_m4): Use ACLOCAL_AMFLAGS.
        (handle_clean): Put -recursive target before -am target.
        (handle_merge_targets): Put basename of $config_name on @all.
-       Test confsub.test.  From Ramón García Fernández.
+       Test confsub.test.  From Ramón García Fernández.
 
 Tue Jan 28 22:19:04 1997  Tom Tromey  <address@hidden>
 
diff --git a/NEWS b/NEWS
index a5dc93f..d368eec 100644
--- a/NEWS
+++ b/NEWS
@@ -1492,7 +1492,7 @@ New in 0.32:
 
 New in 0.31:
 * Bug fixes
-* Documentation updates (many from François Pinard)
+* Documentation updates (many from François Pinard)
 * strictness `normal' now renamed to `foreign'
 * Renamed --install-missing to --add-missing
 * Now handles AC_CONFIG_AUX_DIR
@@ -1550,7 +1550,7 @@ New in 0.26:
 * Comments in Makefile.am are placed more intelligently in Makefile.in
 * Generates .PHONY target
 * Rule or macro in Makefile.am now overrides contents of Automake file
-* Substantial cleanups from François Pinard
+* Substantial cleanups from François Pinard
 
 New in 0.25:
 * Bug fixes.
diff --git a/TODO b/TODO
index 0c28f49..79f298f 100644
--- a/TODO
+++ b/TODO
@@ -311,7 +311,7 @@ them in a directory)
 
 Handle dist-zoo.  Generally add more DOS support.  Maybe run "doschk"
 (why isn't this merged with "pathchk"?) when doing a dist.  Do
-whatever else François says here...
+whatever else François says here...
 
 Add support for html via an option.  Use texi2html.  Use
 "html_TEXINFOS", and htmldir = .../html.  Include html files in
@@ -373,7 +373,7 @@ Auto-distribute "ChangeLog.[0-9]+"?  "ChangeLog.[a-z]+"?
 Internationalize. [ gettext doesn't have the necessary machinery yet ]
 am_error should use printf-style arguments (for eventual gettext scheme)
 
-François says the ordering of files in a distribution should be as follows:
+François says the ordering of files in a distribution should be as follows:
 * README
 * source files
 * derived files
@@ -433,7 +433,7 @@ follow calc example in dejagnu docs
 
 document which variables are actually scanned and which are not.
 
-Document customary ordering of Makefile.am.  From François.
+Document customary ordering of Makefile.am.  From François.
 
 Should include extended version of diagram from Autoconf (suggested by
 Greg Woods)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8692de5..c0efdc3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -249,7 +249,7 @@ comment8.test \
 comment9.test \
 commen10.test \
 commen11.test \
-comments-in-var-defn.test \
+comments-in-var-def.test \
 compile.test \
 compile2.test \
 compile3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8a25879..311b524 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -511,7 +511,7 @@ comment8.test \
 comment9.test \
 commen10.test \
 commen11.test \
-comments-in-var-defn.test \
+comments-in-var-def.test \
 compile.test \
 compile2.test \
 compile3.test \
diff --git a/tests/comments-in-var-defn.test b/tests/comments-in-var-def.test
similarity index 100%
rename from tests/comments-in-var-defn.test
rename to tests/comments-in-var-def.test


hooks/post-receive
-- 
GNU Automake