Merge branch 'maint'

* maint:
  tests: fix bug in 'autodist.test'

diff --cc ChangeLog
Simple merge

diff --cc tests/autodist.test
index 681be09,70ec0af..7e0fc37
--- 1/tests/autodist.test
--- 2/tests/autodist.test
+++ b/tests/autodist.test
@@@ -21,9 -21,11 +21,9 @@@
  
  . ./defs || Exit 1
  
 -set -e
 -
  # Ensure we are run from the right directory.
  # (The last thing we want is to delete some random user files.)
- test -f ../defs-static
 -test -f ../defs
++test -f ../defs-static && test -f ../defs || Exit 99
  rm -f *
  
  cat > configure.in <<END