changeset in /hg/icedtea: Search java-icedtea last, as it's the ...

[Andrew John Hughes]

changeset a1476b6655c1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a1476b6655c1
description:
	Search java-icedtea last, as it's the worst choice (old 1.7 on Fedora).

	2009-05-27  Andrew John Hughes  <ahughes at 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.

diffstat:

2 files changed, 13 insertions(+), 6 deletions(-)
ChangeLog    |    7 +++++++
acinclude.m4 |   12 ++++++------

diffs (43 lines):

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
+2009-05-27  Andrew John Hughes  <ahughes at 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 at 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 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK],
                 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 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA],
                 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