# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1309367817 -3600
# Node ID 9ec64ff41e914796bfd0722005db204a9fe01a80
# Parent  4388af44fea7db46e414af409628d7db5230897d
Check that JDK binaries are files in addition to being executable.

2011-06-29  Andrew John Hughes  <ahughes@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.

diff -r 4388af44fea7 -r 9ec64ff41e91 ChangeLog
--- a/ChangeLog	Wed Jun 29 13:32:30 2011 +0100
+++ b/ChangeLog	Wed Jun 29 18:16:57 2011 +0100
@@ -1,3 +1,13 @@
+2011-06-29  Andrew John Hughes  <ahughes@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-28  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am,
diff -r 4388af44fea7 -r 9ec64ff41e91 acinclude.m4
--- a/acinclude.m4	Wed Jun 29 13:32:30 2011 +0100
+++ b/acinclude.m4	Wed Jun 29 18:16:57 2011 +0100
@@ -227,8 +227,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])
@@ -380,8 +380,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])
@@ -417,8 +417,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])
@@ -487,8 +487,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])
@@ -524,8 +524,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])