changeset in /hg/icedtea6: Fix JDk directory macros to drop out ...

[Andrew John Hughes]

changeset b0be146027ad in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b0be146027ad
description:
	Fix JDk directory macros to drop out of the default for loop
	when the first solution is found.  At present, the loop will
	use the last solution found.  This should be more intuitive.

	2009-02-04  Andrew John Hughes  <ahughes at redhat.com>

		* acinclude.m4:
		(AC_CHECK_FOR_GCJ_JDK): Drop out of loop
		when first solution is found.
		(AC_CHECK_FOR_OPENJDK): Likewise.
		(AC_CHECK_FOR_ICEDTEA): Likewise.

diffstat:

2 files changed, 20 insertions(+), 3 deletions(-)
ChangeLog    |    8 ++++++++
acinclude.m4 |   15 ++++++++++++---

diffs (54 lines):

diff -r ab71ebb1e8b6 -r b0be146027ad ChangeLog
--- a/ChangeLog	Wed Feb 04 11:51:13 2009 +0000
+++ b/ChangeLog	Wed Feb 04 12:48:30 2009 +0000
@@ -1,3 +1,11 @@ 2009-02-04  Andrew John Hughes  <ahughes
+2009-02-04  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(AC_CHECK_FOR_GCJ_JDK): Drop out of loop
+	when first solution is found.
+	(AC_CHECK_FOR_OPENJDK): Likewise.
+	(AC_CHECK_FOR_ICEDTEA): Likewise.
+	
 2009-02-04  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r ab71ebb1e8b6 -r b0be146027ad acinclude.m4
--- a/acinclude.m4	Wed Feb 04 11:51:13 2009 +0000
+++ b/acinclude.m4	Wed Feb 04 12:48:30 2009 +0000
@@ -944,7 +944,10 @@ AC_DEFUN([AC_CHECK_FOR_GCJ_JDK],
               ])
   if test -z "${SYSTEM_GCJ_DIR}"; then
     for dir in /usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao ; do
-       test -d $dir && SYSTEM_GCJ_DIR=$dir
+       if test -d $dir; then
+         SYSTEM_GCJ_DIR=$dir
+	 break
+       fi
     done
   fi
   AC_MSG_RESULT(${SYSTEM_GCJ_DIR})
@@ -977,7 +980,10 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK],
               ])
   if test -z "${SYSTEM_OPENJDK_DIR}"; then
     for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk ; do
-       test -d $dir && SYSTEM_OPENJDK_DIR=$dir
+       if test -d $dir; then
+         SYSTEM_OPENJDK_DIR=$dir
+	 break
+       fi
     done
   fi
   AC_MSG_RESULT(${SYSTEM_OPENJDK_DIR})
@@ -1010,7 +1016,10 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA],
               ])
   if test -z "${SYSTEM_ICEDTEA_DIR}"; then
     for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do
-       test -d $dir && SYSTEM_ICEDTEA_DIR=$dir
+       if test -d $dir; then
+         SYSTEM_ICEDTEA_DIR=$dir
+	 break
+       fi
     done
   fi
   AC_MSG_RESULT(${SYSTEM_ICEDTEA_DIR})