# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1350007383 -3600
# Node ID 1fc1f8fb1d66021359a898f4679856234bbf9b17
# Parent  bab6ae8c1c8635868ee42e871242138d5dcd02e9# Parent  287ce812e84e680074910d59fb7b6f247ba6930a
Merge

diff -r bab6ae8c1c86 -r 1fc1f8fb1d66 ChangeLog
--- a/ChangeLog	Fri Oct 12 02:20:06 2012 +0100
+++ b/ChangeLog	Fri Oct 12 03:03:03 2012 +0100
@@ -42,6 +42,16 @@
 	* patches/security/20121016/original/7158804.patch:
 	New patches.
 
+2012-03-19  Andrew John Hughes  <ahughes@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@ubuntu.com>
 
 	* configure.ac: Remove the Xp header and library checks.
diff -r bab6ae8c1c86 -r 1fc1f8fb1d66 NEWS
--- a/NEWS	Fri Oct 12 02:20:06 2012 +0100
+++ b/NEWS	Fri Oct 12 03:03:03 2012 +0100
@@ -35,6 +35,8 @@
   - S7198606, CVE-2012-4416: Improve VM optimization
 * Backports
   - S7092186: adjust package access in rmiregistry
+* Bug fixes
+  - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
 
 New in release 1.10.9 (2012-08-31):
 
diff -r bab6ae8c1c86 -r 1fc1f8fb1d66 acinclude.m4
--- a/acinclude.m4	Fri Oct 12 02:20:06 2012 +0100
+++ b/acinclude.m4	Fri Oct 12 03:03:03 2012 +0100
@@ -1140,9 +1140,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