Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc tests/defs
index 77bb534,8aaf108..a36f718
--- 1/tests/defs
--- 2/tests/defs.in
+++ b/tests/defs
@@@ -284,11 -163,15 +284,15 @@@ d
        # it will try link *nothing* and complain it cannot find
        # main(); funny).  Use -help so it does not try linking anything.
        echo "$me: running $CC -V -help"
 -      ( $CC -V -help ) || exit 77
 +      $CC -V -help || exit 77
        ;;
      javac)
-       echo "$me: running javac -version"
-       javac -version || exit 77
+       # The Java compiler from JDK 1.5 (and presumably earlier versions)
+       # cannot handle the `-version' option by itself: it bails out
+       # telling that source files are missing.  Adding also the `-help'
+       # option seems to solve the problem.
+       echo "$me: running javac -version -help"
+       javac -version -help || exit 77
        ;;
      makedepend)
        echo "$me: running makedepend -f-"