From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 10 Apr 2011 13:37:23 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c408beafae2ab5909bfd8b04df1ca93aedc6b5e7;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

c408beafae2ab5909bfd8b04df1ca93aedc6b5e7
diff --cc tests/defs
index 77bb534c9,8aaf108fb..a36f7180b
--- a/tests/defs
+++ 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-"