# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1243535510 -3600
# Node ID a1476b6655c10482ae8b512ce8da1f2b54af5023
# Parent  c1ca56ce26f5cdd72876d5f7419cf0fc2092a1c1
Search java-icedtea last, as it's the worst choice (old 1.7 on Fedora).

2009-05-27  Andrew John Hughes  <ahughes@redhat.com>

	* acinclude.m4:
	Search java-icedtea last not first.  It's
	from the old 1.7 packages on Fedora (and can
	be empty), so should be our last choice.

diff -r c1ca56ce26f5 -r a1476b6655c1 ChangeLog
--- a/ChangeLog	Thu May 28 15:06:49 2009 +0100
+++ b/ChangeLog	Thu May 28 19:31:50 2009 +0100
@@ -1,3 +1,10 @@
+2009-05-27  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	Search java-icedtea last not first.  It's
+	from the old 1.7 packages on Fedora (and can
+	be empty), so should be our last choice.
+	
 2009-05-27  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
diff -r c1ca56ce26f5 -r a1476b6655c1 acinclude.m4
--- a/acinclude.m4	Thu May 28 15:06:49 2009 +0100
+++ b/acinclude.m4	Thu May 28 19:31:50 2009 +0100
@@ -1213,9 +1213,9 @@
                 SYSTEM_OPENJDK_DIR=
               ])
   if test -z "${SYSTEM_OPENJDK_DIR}"; then
-    for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \
-               /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
-	       /usr/lib/jvm/openjdk; do
+    for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/icedtea6 \
+    	       /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/openjdk \
+	       /usr/lib/jvm/java-icedtea; do
        if test -d $dir; then
          SYSTEM_OPENJDK_DIR=$dir
 	 break
@@ -1251,9 +1251,9 @@
                 SYSTEM_ICEDTEA_DIR=
               ])
   if test -z "${SYSTEM_ICEDTEA_DIR}"; then
-    for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \
-               /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
-	       /usr/lib/jvm/openjdk; do
+    for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/icedtea6 \
+    	       /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/openjdk \
+	       /usr/lib/jvm/java-icedtea; do
        if test -d $dir; then
          SYSTEM_ICEDTEA_DIR=$dir
 	 break