/hg/release/icedtea6-1.11: PR1194: IcedTea tries to build with /...

[andrew at icedtea.classpath.org]

changeset b2abbe3ce55b in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=b2abbe3ce55b
author: andrew
date: Fri Oct 12 02:39:24 2012 +0100

	PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default

	2012-03-19  Andrew John Hughes  <ahughes at redhat.com>

		    PR 1194:
		    * acinclude.m4:
		    (IT_CHECK_FOR_JDK): Update JDK home directory
		    check list, adding some missing 1.6 entries
		    and removing generic ones which may now pick
		    up an unwanted 1.7 installation.
		    * NEWS: Updated.


diffstat:

 ChangeLog    |  10 ++++++++++
 NEWS         |   3 +++
 acinclude.m4 |   4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 7f603a40c817 -r b2abbe3ce55b ChangeLog
--- a/ChangeLog	Wed Sep 05 11:43:29 2012 +0200
+++ b/ChangeLog	Fri Oct 12 02:39:24 2012 +0100
@@ -1,3 +1,13 @@
+2012-03-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR 1194:
+	* acinclude.m4:
+	(IT_CHECK_FOR_JDK): Update JDK home directory
+	check list, adding some missing 1.6 entries
+	and removing generic ones which may now pick
+	up an unwanted 1.7 installation.
+	* NEWS: Updated.
+
 2012-09-05  Matthias Klose  <doko at ubuntu.com>
 
 	* configure.ac: Remove the Xp header and library checks.
diff -r 7f603a40c817 -r b2abbe3ce55b NEWS
--- a/NEWS	Wed Sep 05 11:43:29 2012 +0200
+++ b/NEWS	Fri Oct 12 02:39:24 2012 +0100
@@ -12,6 +12,9 @@
 
 New in release 1.11.5 (2012-XX-XX):
 
+* Bug fixes
+  - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
+
 New in release 1.11.4 (2012-08-31):
 
 * Security fixes
diff -r 7f603a40c817 -r b2abbe3ce55b acinclude.m4
--- a/acinclude.m4	Wed Sep 05 11:43:29 2012 +0200
+++ b/acinclude.m4	Fri Oct 12 02:39:24 2012 +0100
@@ -1147,9 +1147,9 @@
     if test "x${enable_bootstrap}" = "xyes"; then
       BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
     fi
-    for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \
+    for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-1.6.0 \
               /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
-              /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
+              /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/icedtea-6 ; do
        if test -d $dir; then
          SYSTEM_JDK_DIR=$dir
 	 break