/hg/icedtea6: Update list of JDK home directories checked.

[andrew at icedtea.classpath.org]

changeset af04fa17f62f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=af04fa17f62f
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 10:43:41 2012 +0000

	Update list of JDK home directories checked.

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

		* 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.


diffstat:

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

diffs (30 lines):

diff -r 8b157b07b859 -r af04fa17f62f ChangeLog
--- a/ChangeLog	Tue Mar 20 06:01:53 2012 +0000
+++ b/ChangeLog	Tue Mar 20 10:43:41 2012 +0000
@@ -1,3 +1,11 @@
+2012-03-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* 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.
+
 2012-03-16  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR600, 886:
diff -r 8b157b07b859 -r af04fa17f62f acinclude.m4
--- a/acinclude.m4	Tue Mar 20 06:01:53 2012 +0000
+++ b/acinclude.m4	Tue Mar 20 10:43:41 2012 +0000
@@ -1142,9 +1142,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