Mercurial > hg > release > icedtea-1.10

changeset 1820:082075fb775e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make directory searches used by --with-icedtea and --with-openjdk match. 2009-05-21 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4: Search same directories when using --with-openjdk as --with-icedtea.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 21 May 2009 20:10:28 +0100
parents d91c81a1cebc
children 6124157d5bdb 1d35cf933a99
files ChangeLog acinclude.m4
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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@redhat.com>
+
+	* acinclude.m4:
+	Search same directories when using
+	--with-openjdk as --with-icedtea.
+
 2009-05-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	* generated/java/nio/channels/AlreadyBoundException.java,
--- 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 @@
                 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 @@
               ])
   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