--- a/ChangeLog	Wed May 25 01:58:11 2011 +0100
+++ b/ChangeLog	Wed May 25 02:08:09 2011 +0100
@@ -1,3 +1,24 @@
+2011-05-25  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_WITH_CORBA_SRC_ZIP): Check zip exists
+	and is a regular file.  Use a single AM_CONDITIONAL.
+	(IT_WITH_JAXP_SRC_ZIP): Likewise.
+	(IT_WITH_JAXWS_SRC_ZIP): Likewise.
+	(IT_WITH_JDK_SRC_ZIP): Likewise.
+	(IT_WITH_LANGTOOLS_SRC_ZIP): Likewise.
+
+2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_WITH_CACAO_SRC_ZIP): Check zip exists
+	and is a regular file.  Use a single AM_CONDITIONAL.
+	(IT_WITH_OPENJDK_SRC_ZIP): Likewise.
+	(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+	(IT_WITH_JAXP_DROP_ZIP): Likewise.
+	(IT_WITH_JAF_DROP_ZIP): Likewise.
+	(IT_WITH_JAXWS_DROP_ZIP): Likewise.
+
 2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:

--- a/acinclude.m4	Wed May 25 01:58:11 2011 +0100
+++ b/acinclude.m4	Wed May 25 02:08:09 2011 +0100
@@ -547,13 +547,14 @@
               [AS_HELP_STRING([--with-openjdk-src-zip[[=PATH]]],specify the location of the OpenJDK source zip)],
   [
     ALT_OPENJDK_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x = x)
-    AC_SUBST(ALT_OPENJDK_SRC_ZIP)
+    if ! test -f ${ALT_OPENJDK_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid OpenJDK source zip specified: ${ALT_OPENJDK_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_OPENJDK_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test "x{ALT_OPENJDK_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_OPENJDK_SRC_ZIP})
   AC_SUBST(ALT_OPENJDK_SRC_ZIP)
 ])
@@ -897,12 +898,14 @@
               [AS_HELP_STRING(--with-cacao-src-zip=PATH,specify the location of the CACAO source zip)],
   [
     ALT_CACAO_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_CACAO_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid CACAO source zip specified: ${ALT_CACAO_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_CACAO_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test "x{ALT_CACAO_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_CACAO_SRC_ZIP})
   AC_SUBST(ALT_CACAO_SRC_ZIP)
 ])
@@ -1039,153 +1042,171 @@
 
 AC_DEFUN([IT_WITH_HOTSPOT_SRC_ZIP],
 [
-  AC_MSG_CHECKING(for a HotSpot source zip)
+  AC_MSG_CHECKING([for a HotSpot source zip])
   AC_ARG_WITH([hotspot-src-zip],
               [AS_HELP_STRING(--with-hotspot-src-zip=PATH,specify the location of the HotSpot source zip)],
   [
     ALT_HOTSPOT_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_HOTSPOT_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid HotSpot source zip specified: ${ALT_HOTSPOT_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_HOTSPOT_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test "x{ALT_HOTSPOT_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_HOTSPOT_SRC_ZIP})
   AC_SUBST(ALT_HOTSPOT_SRC_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_CORBA_SRC_ZIP],
 [
-  AC_MSG_CHECKING(for a CORBA source zip)
+  AC_MSG_CHECKING([for a CORBA source zip])
   AC_ARG_WITH([corba-src-zip],
               [AS_HELP_STRING(--with-corba-src-zip=PATH,specify the location of the CORBA source zip)],
   [
     ALT_CORBA_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_CORBA_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid CORBA source zip specified: ${ALT_CORBA_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_CORBA_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test "x{ALT_CORBA_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_CORBA_SRC_ZIP})
   AC_SUBST(ALT_CORBA_SRC_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_JAXP_SRC_ZIP],
 [
-  AC_MSG_CHECKING(for a JAXP source zip)
+  AC_MSG_CHECKING([for a JAXP source zip])
   AC_ARG_WITH([jaxp-src-zip],
               [AS_HELP_STRING(--with-jaxp-src-zip=PATH,specify the location of the JAXP source zip)],
   [
     ALT_JAXP_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_JAXP_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid JAXP source zip specified: ${ALT_JAXP_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_JAXP_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test "x{ALT_JAXP_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_JAXP_SRC_ZIP})
   AC_SUBST(ALT_JAXP_SRC_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_JAXWS_SRC_ZIP],
 [
-  AC_MSG_CHECKING(for a JAXWS source zip)
+  AC_MSG_CHECKING([for a JAXWS source zip])
   AC_ARG_WITH([jaxws-src-zip],
               [AS_HELP_STRING(--with-jaxws-src-zip=PATH,specify the location of the JAXWS source zip)],
   [
     ALT_JAXWS_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_JAXWS_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid JAXWS source zip specified: ${ALT_JAXWS_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_JAXWS_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test "x{ALT_JAXWS_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_JAXWS_SRC_ZIP})
   AC_SUBST(ALT_JAXWS_SRC_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_JDK_SRC_ZIP],
 [
-  AC_MSG_CHECKING(for a JDK source zip)
+  AC_MSG_CHECKING([for a JDK source zip])
   AC_ARG_WITH([jdk-src-zip],
               [AS_HELP_STRING(--with-jdk-src-zip=PATH,specify the location of the JDK source zip)],
   [
     ALT_JDK_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_JDK_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid JDK source zip specified: ${ALT_JDK_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_JDK_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test "x{ALT_JDK_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_JDK_SRC_ZIP})
   AC_SUBST(ALT_JDK_SRC_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_LANGTOOLS_SRC_ZIP],
 [
-  AC_MSG_CHECKING(for a langtools source zip)
+  AC_MSG_CHECKING([for a langtools source zip])
   AC_ARG_WITH([langtools-src-zip],
               [AS_HELP_STRING(--with-langtools-src-zip=PATH,specify the location of the langtools source zip)],
   [
     ALT_LANGTOOLS_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_LANGTOOLS_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid langtools source zip specified: ${ALT_LANGTOOLS_SRC_ZIP}])
+    fi
   ],
   [ 
     ALT_LANGTOOLS_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test "x{ALT_LANGTOOLS_SRC_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_LANGTOOLS_SRC_ZIP})
   AC_SUBST(ALT_LANGTOOLS_SRC_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_JAXP_DROP_ZIP],
 [
-  AC_MSG_CHECKING(for a JAXP drop zip)
+  AC_MSG_CHECKING([for a JAXP drop zip])
   AC_ARG_WITH([jaxp-drop-zip],
               [AS_HELP_STRING(--with-jaxp-drop-zip=PATH,specify the location of the JAXP drop zip)],
   [
     ALT_JAXP_DROP_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x = x)
+    if ! test -f ${ALT_JAXP_DROP_ZIP} ; then
+      AC_MSG_ERROR([Invalid JAXP drop zip specified: ${ALT_JAXP_DROP_ZIP}])
+    fi
   ],
   [ 
     ALT_JAXP_DROP_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test "x{ALT_JAXP_DROP_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_JAXP_DROP_ZIP})
   AC_SUBST(ALT_JAXP_DROP_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_JAF_DROP_ZIP],
 [
-  AC_MSG_CHECKING(for a JAF drop zip)
+  AC_MSG_CHECKING([for a JAF drop zip])
   AC_ARG_WITH([jaf-drop-zip],
               [AS_HELP_STRING(--with-jaf-drop-zip=PATH,specify the location of the JAF drop zip)],
   [
     ALT_JAF_DROP_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x = x)
+    if ! test -f ${ALT_JAF_DROP_ZIP} ; then
+      AC_MSG_ERROR([Invalid JAF drop zip specified: ${ALT_JAF_DROP_ZIP}])
+    fi
   ],
   [ 
     ALT_JAF_DROP_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test "x{ALT_JAF_DROP_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_JAF_DROP_ZIP})
   AC_SUBST(ALT_JAF_DROP_ZIP)
 ])
 
 AC_DEFUN([IT_WITH_JAXWS_DROP_ZIP],
 [
-  AC_MSG_CHECKING(for a JAXWS drop zip)
+  AC_MSG_CHECKING([for a JAXWS drop zip])
   AC_ARG_WITH([jaxws-drop-zip],
               [AS_HELP_STRING(--with-jaxws-drop-zip=PATH,specify the location of the JAXWS drop zip)],
   [
     ALT_JAXWS_DROP_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x = x)
+    if ! test -f ${ALT_JAXWS_DROP_ZIP} ; then
+      AC_MSG_ERROR([Invalid JAXWS drop zip specified: ${ALT_JAXWS_DROP_ZIP}])
+    fi
   ],
   [ 
     ALT_JAXWS_DROP_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x != x)
   ])
+  AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test "x{ALT_JAXWS_DROP_ZIP}" = "xnot specified")
   AC_MSG_RESULT(${ALT_JAXWS_DROP_ZIP})
   AC_SUBST(ALT_JAXWS_DROP_ZIP)
 ])