Merge branch 'maint' into msvc

* maint: (56 commits)
  tests: fix failure due to debugging code forgotten into a test
  tests: avoid spurious failure of libtool and gettext tests
  hacking: distribute it, and mention it in the ChangeLog
  regex: deprecate the obsolete macro AM_WITH_REGEX
  maint: distribute .xz tarballs, not .bz2 ones
  maint: better use of autoconf 2.68 features
  cosmetics: use proper m4 quoting in configure.ac
  include: avoid "deleted .am file" problem
  tests: better handling of gettext and libtool requirements
  fix: typos and grammaros in comments of the new test
  tests: report useful system information in 'test-suite.log'
  python: remove relics for Python 1.5 support
  configure: remove extraneous 'eval's from AM_RUN_LOG invocations
  configure: report TeX version in config.log
  maint: snapshots from `maint' are still development snapshots
  configure: print proper message for test releases
  devel: help in comparing Makefile.in from different commits
  repo: don't commit generated files in the git repository anymore
  maint: remove executable bit from automake.in
  missing: don't try to re-run tar with a munged command line
  ...

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 92f3d8c,db448a9..8c5d897
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -27,9 -37,11 +37,14 @@@ New in 1.11.0a
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  
+   - You may adjust the compression options used in dist-xz and dist-bzip2.
+     The default is now merely -e for xz, but still -9 for bzip;  you may
+     specify a different level via the XZ_OPT and BZIP2 envvars respectively.
+     E.g., "make dist-xz XZ_OPT=-7" or "make dist-bzip2 BZIP2=-5"
+ 
 +  - The `compile' script now converts some options for MSVC for a better
 +    user experience.  Similarly, the new `ar-lib' script wraps Microsoft lib.
 +
    - The py-compile script now accepts empty arguments passed to the options
      `--destdir' and `--basedir', and complains about unrecognized options.
      Moreover, a non-option argument or a special `--' argument terminates
@@@ -40,14 -52,9 +55,14 @@@
      the developer-reserved makefile variable AM_DISTCHECK_CONFIGURE_FLAGS,
      instead of the old DISTCHECK_CONFIGURE_FLAGS.
      The DISTCHECK_CONFIGURE_FLAGS variable should now be reserved for the
-     user; still, the old Makefile.am files that used to define it should
+     user; still, the old Makefile.am files that used to define it will
      still continue to work as before.
  
 +  - New macro AM_PROG_AR that looks for an archiver and wraps it in the new
 +    'ar-lib' auxiliary script if the selected archiver is Microsoft lib.
 +    This new macro is required for LIBRARIES and LTLIBRARIES when automake
 +    is run with -Wextra-portability (or -Wall) and -Werror.
 +
    - When using DejaGnu-based testsuites, the user can extend the `site.exp'
      file generated by automake-provided rules by defining the special make
      variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.

diff --cc automake.in
index edfa7e9,309eade..c61e6c3
mode 100755,100644..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc doc/automake.texi
Simple merge

diff --cc lib/depcomp
index 9825d56,5621fd4..bd0ac08
--- 1/lib/depcomp
--- 2/lib/depcomp
+++ b/lib/depcomp
@@@ -1,10 -1,10 +1,10 @@@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
- scriptversion=2011-04-16.09; # UTC
+ scriptversion=2011-12-04.11; # UTC
  
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011,
 -# Free Software Foundation, Inc.
 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 +# 2011 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

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/defs.in
Simple merge