--- a/ChangeLog	Wed May 25 02:17:57 2011 +0100
+++ b/ChangeLog	Wed May 25 02:20:29 2011 +0100
@@ -1,3 +1,23 @@
+2011-05-25  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_WITH_CORBA_SRC_ZIP): Add missing $.
+	(IT_WITH_JAXP_SRC_ZIP): Likewise.
+	(IT_WITH_JAXWS_SRC_ZIP): Likewise.
+	(IT_WITH_JDK_SRC_ZIP): Likewise.
+	(IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
+
+2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_WITH_CACAO_SRC_ZIP): Add missing $.
+	(IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
+	(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-05-25  Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:

--- a/acinclude.m4	Wed May 25 02:17:57 2011 +0100
+++ b/acinclude.m4	Wed May 25 02:20:29 2011 +0100
@@ -556,7 +556,7 @@
   [ 
     ALT_OPENJDK_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test "x{ALT_OPENJDK_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -909,7 +909,7 @@
   [ 
     ALT_CACAO_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test "x{ALT_CACAO_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1060,7 +1060,7 @@
   [ 
     ALT_HOTSPOT_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test "x{ALT_HOTSPOT_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1081,7 +1081,7 @@
   [ 
     ALT_CORBA_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test "x{ALT_CORBA_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1102,7 +1102,7 @@
   [ 
     ALT_JAXP_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test "x{ALT_JAXP_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1123,7 +1123,7 @@
   [ 
     ALT_JAXWS_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test "x{ALT_JAXWS_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1144,7 +1144,7 @@
   [ 
     ALT_JDK_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test "x{ALT_JDK_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1165,7 +1165,7 @@
   [ 
     ALT_LANGTOOLS_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test "x{ALT_LANGTOOLS_SRC_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1186,7 +1186,7 @@
   [ 
     ALT_JAXP_DROP_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test "x{ALT_JAXP_DROP_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1207,7 +1207,7 @@
   [ 
     ALT_JAF_DROP_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test "x{ALT_JAF_DROP_ZIP}" != "xnot specified")
+  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)
 ])
@@ -1228,7 +1228,7 @@
   [ 
     ALT_JAXWS_DROP_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test "x{ALT_JAXWS_DROP_ZIP}" != "xnot specified")
+  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)
 ])
@@ -2039,7 +2039,7 @@
   [
     ALT_JAMVM_SRC_ZIP="not specified"
   ])
-  AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test "x{ALT_JAMVM_SRC_ZIP}" != "xnot specified")
+  AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test "x${ALT_JAMVM_SRC_ZIP}" != "xnot specified")
   AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP})
   AC_SUBST(ALT_JAMVM_SRC_ZIP)
 ])