Merge branch 'maint'

diff --cc aclocal.m4
Simple merge

diff --cc configure
index 80e27055d4534af28b28b662f7e0d4bdb07cfb8f,5af3df8682e479b8630a15b37ddeede18888ef3a..169d82dc7b1a5b78cef806832c08f5c486f62bcf
--- 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.67 for GNU Automake 1.11a.
 -# Generated by GNU Autoconf 2.68 for GNU Automake 1.11.
++# Generated by GNU Autoconf 2.68 for GNU Automake 1.11a.
  #
  # Report bugs to <bug-automake@gnu.org>.
  #
@@@ -1336,8 -1334,8 +1344,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.67
+ generated by GNU Autoconf 2.68
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
@@@ -1353,8 -1351,8 +1361,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.67.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    $ $0 $@
  
@@@ -2916,16 -2902,9 +2935,16 @@@ LIBOBJS=$ac_libobj
  LTLIBOBJS=$ac_ltlibobjs
  
  
 +if test -n "$am_sleep_pid"; then
 +       { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 +$as_echo_n "checking that generated files are newer than configure... " >&6; }
 +       wait $am_sleep_pid
 +       { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
 +$as_echo "done" >&6; }
 +     fi
  
  
- : ${CONFIG_STATUS=./config.status}
+ : "${CONFIG_STATUS=./config.status}"
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@@ -3332,8 -3312,8 +3352,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.67.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -3387,8 -3367,8 +3407,8 @@@ _ACEO
  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.67,
+ configured by $0, generated by GNU Autoconf 2.68,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.