changeset in /hg/icedtea: Make directory searches used by --with...

[Andrew John Hughes]

changeset 082075fb775e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=082075fb775e
description:
	Make directory searches used by --with-icedtea and --with-openjdk match.

	2009-05-21  Andrew John Hughes  <ahughes at redhat.com>

		* acinclude.m4:
		Search same directories when using
		--with-openjdk as --with-icedtea.

diffstat:

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

diffs (37 lines):

diff -r d91c81a1cebc -r 082075fb775e ChangeLog
--- a/ChangeLog	Thu May 21 20:03:37 2009 +0100
+++ b/ChangeLog	Thu May 21 20:10:28 2009 +0100
@@ -1,3 +1,9 @@ 2009-05-21  Andrew John Hughes  <ahughes
+2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	Search same directories when using
+	--with-openjdk as --with-icedtea.
+
 2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* generated/java/nio/channels/AlreadyBoundException.java,
diff -r d91c81a1cebc -r 082075fb775e acinclude.m4
--- a/acinclude.m4	Thu May 21 20:03:37 2009 +0100
+++ b/acinclude.m4	Thu May 21 20:10:28 2009 +0100
@@ -1213,7 +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-openjdk /usr/lib/jvm/openjdk ; do
+    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
        if test -d $dir; then
          SYSTEM_OPENJDK_DIR=$dir
 	 break
@@ -1250,7 +1252,8 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA],
               ])
   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 ; do
+               /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
+	       /usr/lib/jvm/openjdk; do
        if test -d $dir; then
          SYSTEM_ICEDTEA_DIR=$dir
 	 break