Merge branch 'maint'

diff --cc ChangeLog
index 58f1b46581321504a84a6760bc7703b799c193f6,ce2d912fe431bbd0ace2031e42233d5597246af8..3e0f5b49cb0774a4a9aeab90f0b41411c8be325c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,33 +1,51 @@@
+ 2009-12-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+ 
+       Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
+       * lib/am/distdir.am (distcheck): Use lzma -d, gzip -d, bzip2 -d,
+       instead of the respective un$tool invocation, to avoid depending
+       on another tool.
+       * THANKS: Update.
+ 
+ 2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Use $DJDIR rather than $DJGPP to detect running on DJGPP.
+       * automake.in (Language): Use $ENV{'DJDIR'} for the
+       $ENV{'SHELL'} override.
+       * bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
+       bootstrapping under MinGW when $DJGPP has been set.
+ 
+       Do not rely on Perl symlink status, for MSYS perl.
+       * automake.in (require_file_internal): Ensure presence of
+       symlink target file; MSYS perl symlink doesn't return an error
+       status when the file could not be created (copied, on this
+       system).  Fixes symlink.test failure.
+ 
+ 2009-12-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Avoid Solaris sh `set -e' bug in vala4.test.
+       * tests/vala4.test: New variable $cwd, holding the full path of the
+       current directory.  Use it instead of `pwd` command substitution,
+       to avoid Heirloom/Solaris Sh bug with `set -e'.
+ 
 +2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix requirements of silent8.test.
 +      * tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o,
 +      dvips.
 +
 +2009-12-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      File `automake.in' is not meant to be executed (only to be
 +      preprocessed into `automake'), so don't leave it executable.
 +      * automake.in: Remove executable bit.
 +
 +2009-12-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Don't make the generated Automake's Config.pm executable.
 +      * lib/Automake/Makefile.am (Config.pm): Don't make the generated
 +      `Config.pm' file executable.
 +
  2009-11-28  Jim Meyering  <meyering@redhat.com>
  
        do not put world-writable directories in distribution tarballs

diff --cc Makefile.in
Simple merge

diff --cc THANKS
Simple merge

diff --cc aclocal.m4
Simple merge

diff --cc automake.in
index 2af2897d6e609956c89507cb3637b1d2d875e9f1,e934c5fef727adbf3546f0407a7809a4920089bb..1d1f40c8c95fdca75c45afc3862f2354a0e5944d
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc configure
index 6c63ac64a2603218845ea70d9a7890f717983940,9dc15456a0f8d34bfb37e907670fe4f8f2521b18..6bb1f12ef0350fac13685640b8ba668882bacc72
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.64 for GNU Automake 1.11a.
 -# Generated by GNU Autoconf 2.65 for GNU Automake 1.11.
++# Generated by GNU Autoconf 2.65 for GNU Automake 1.11a.
  #
  # Report bugs to <bug-automake@gnu.org>.
  #
@@@ -1332,8 -1325,8 +1335,8 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -GNU Automake configure 1.11
 +GNU Automake configure 1.11a
- generated by GNU Autoconf 2.64
+ generated by GNU Autoconf 2.65
  
  Copyright (C) 2009 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
@@@ -1349,8 -1342,8 +1352,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
 -It was created by GNU Automake $as_me 1.11, which was
 +It was created by GNU Automake $as_me 1.11a, which was
- generated by GNU Autoconf 2.64.  Invocation command line was
+ generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
@@@ -3299,8 -3280,8 +3302,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
 -This file was extended by GNU Automake $as_me 1.11, which was
 +This file was extended by GNU Automake $as_me 1.11a, which was
- generated by GNU Autoconf 2.64.  Invocation command line was
+ generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -3351,10 -3333,11 +3355,11 @@@ General help using GNU software: <http:
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
 -GNU Automake config.status 1.11
 +GNU Automake config.status 1.11a
- configured by $0, generated by GNU Autoconf 2.64,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ configured by $0, generated by GNU Autoconf 2.65,
+   with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation

diff --cc lib/am/distdir.am
Simple merge