Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc tests/compile_f_c_cxx.test
index ef0692dc8937cc2c3c34c3d8478b6c5570ce559c,d1836fb9f6e8473183be160aa4b0e1a4b2a6ef9c..e3b51a42130badebd5193aab0c3305678aff54e9
--- 1/tests/compile_f_c_cxx.test
--- 2/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@@ -31,8 -33,15 +31,11 @@@ EN
  cat > Makefile.am << 'END'
  bin_PROGRAMS = foo
  foo_SOURCES  = foo.f bar.c baz.cc
 -foo_LDADD    = @FLIBS@
  END
  
 -: > foo.f
 -: > bar.c
 -: > baz.cc
+ : > config.guess
+ : > config.sub
+ 
  $ACLOCAL
  $AUTOMAKE
  

diff --cc tests/flibs.test
Simple merge

diff --cc tests/fort4.test
Simple merge