/hg/icedtea6: Check that JDK binaries are files in addition to b...

[andrew at icedtea.classpath.org]

changeset e481486df309 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e481486df309
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 29 18:16:57 2011 +0100

	Check that JDK binaries are files in addition to being executable.

	2011-06-29 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (IT_FIND_JAVA): Check that the
	binary is also a regular file as well as executable.
	(IT_FIND_JAVAH): Likewise. (IT_FIND_JAR): Likewise.
	(IT_FIND_RMIC): Likewise. (IT_FIND_NATIVE2ASCII): Likewise.


diffstat:

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

diffs (75 lines):

diff -r 70ed85d57999 -r e481486df309 ChangeLog
--- a/ChangeLog	Wed Jun 29 12:06:12 2011 +0200
+++ b/ChangeLog	Wed Jun 29 18:16:57 2011 +0100
@@ -1,3 +1,13 @@
+2011-06-29  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(IT_FIND_JAVA): Check that the binary is also
+	a regular file as well as executable.
+	(IT_FIND_JAVAH): Likewise.
+	(IT_FIND_JAR): Likewise.
+	(IT_FIND_RMIC): Likewise.
+	(IT_FIND_NATIVE2ASCII): Likewise.
+
 2011-06-29  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: added new patches
diff -r 70ed85d57999 -r e481486df309 acinclude.m4
--- a/acinclude.m4	Wed Jun 29 12:06:12 2011 +0200
+++ b/acinclude.m4	Wed Jun 29 18:16:57 2011 +0100
@@ -238,8 +238,8 @@
   if test "x${JAVA}" = "xno"; then
     JAVA=${JAVA_DEFAULT}
   fi
-  AC_MSG_CHECKING([if $JAVA is a valid executable])
-  if test -x "${JAVA}"; then
+  AC_MSG_CHECKING([if $JAVA is a valid executable file])
+  if test -x "${JAVA}" && test -f "${JAVA}"; then
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])
@@ -391,8 +391,8 @@
   if test "x${JAVAH}" = "xno"; then
     JAVAH=${JAVAH_DEFAULT}
   fi
-  AC_MSG_CHECKING([if $JAVAH is a valid executable])
-  if test -x "${JAVAH}"; then
+  AC_MSG_CHECKING([if $JAVAH is a valid executable file])
+  if test -x "${JAVAH}" && test -f "${JAVAH}"; then
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])
@@ -428,8 +428,8 @@
   if test "x${JAR}" = "xno"; then
     JAR=${JAR_DEFAULT}
   fi
-  AC_MSG_CHECKING([if $JAR is a valid executable])
-  if test -x "${JAR}"; then
+  AC_MSG_CHECKING([if $JAR is a valid executable file])
+  if test -x "${JAR}" && test -f "${JAR}"; then
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])
@@ -498,8 +498,8 @@
   if test "x${RMIC}" = "xno"; then
     RMIC=${RMIC_DEFAULT}
   fi
-  AC_MSG_CHECKING([if $RMIC is a valid executable])
-  if test -x "${RMIC}"; then
+  AC_MSG_CHECKING([if $RMIC is a valid executable file])
+  if test -x "${RMIC}" && test -f "${RMIC}"; then
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])
@@ -535,8 +535,8 @@
   if test "x${NATIVE2ASCII}" = "xno"; then
     NATIVE2ASCII=${NATIVE2ASCII_DEFAULT}
   fi
-  AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable])
-  if test -x "${NATIVE2ASCII}"; then
+  AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable file])
+  if test -x "${NATIVE2ASCII}" && test -f "${NATIVE2ASCII}"; then
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])