--- a/ChangeLog	Thu May 07 14:15:56 2009 +0100
+++ b/ChangeLog	Thu May 07 16:58:42 2009 +0100
@@ -1,3 +1,17 @@
+2009-05-07  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Support replacing the zips for CORBA,
+	JAXP, JAXWS, JDK and langtools.
+	* acinclude.m4:
+	(WITH_CORBA_SRC_ZIP): Added.
+	(WITH_JAXP_SRC_ZIP): Likewise.
+	(WITH_JAXWS_SRC_ZIP): Likewise.
+	(WITH_JDK_SRC_ZIP): Likewise.
+	(WITH_LANGTOOLS_SRC_ZIP): Likewise.
+	* configure.ac:
+	Include new macros.
+	
 2009-05-07  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Thu May 07 14:15:56 2009 +0100
+++ b/Makefile.am	Thu May 07 16:58:42 2009 +0100
@@ -1572,6 +1572,26 @@
   HS_URL = $(HOTSPOT_URL)
 endif
 
+if USE_ALT_CORBA_SRC_ZIP
+  CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP)
+endif
+
+if USE_ALT_JAXP_SRC_ZIP
+  JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP)
+endif
+
+if USE_ALT_JAXWS_SRC_ZIP
+  JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP)
+endif
+
+if USE_ALT_JDK_SRC_ZIP
+  JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP)
+endif
+
+if USE_ALT_LANGTOOLS_SRC_ZIP
+  LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP)
+endif
+
 CACAO_BASE_URL = http://www.complang.tuwien.ac.at
 CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
 

--- a/acinclude.m4	Thu May 07 14:15:56 2009 +0100
+++ b/acinclude.m4	Thu May 07 16:58:42 2009 +0100
@@ -1031,6 +1031,91 @@
   AC_SUBST(ALT_HOTSPOT_SRC_ZIP)
 ])
 
+AC_DEFUN([WITH_CORBA_SRC_ZIP],
+[
+  AC_MSG_CHECKING(for a CORBA source zip)
+  AC_ARG_WITH([corba-src-zip],
+              [AS_HELP_STRING(--with-corba-src-zip,specify the location of the corba source zip)],
+  [
+    ALT_CORBA_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test x = x)
+  ],
+  [ 
+    ALT_CORBA_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_CORBA_SRC_ZIP})
+  AC_SUBST(ALT_CORBA_SRC_ZIP)
+])
+
+AC_DEFUN([WITH_JAXP_SRC_ZIP],
+[
+  AC_MSG_CHECKING(for a JAXP source zip)
+  AC_ARG_WITH([jaxp-src-zip],
+              [AS_HELP_STRING(--with-jaxp-src-zip,specify the location of the jaxp source zip)],
+  [
+    ALT_JAXP_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test x = x)
+  ],
+  [ 
+    ALT_JAXP_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAXP_SRC_ZIP})
+  AC_SUBST(ALT_JAXP_SRC_ZIP)
+])
+
+AC_DEFUN([WITH_JAXWS_SRC_ZIP],
+[
+  AC_MSG_CHECKING(for a JAXWS source zip)
+  AC_ARG_WITH([jaxws-src-zip],
+              [AS_HELP_STRING(--with-jaxws-src-zip,specify the location of the jaxws source zip)],
+  [
+    ALT_JAXWS_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test x = x)
+  ],
+  [ 
+    ALT_JAXWS_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAXWS_SRC_ZIP})
+  AC_SUBST(ALT_JAXWS_SRC_ZIP)
+])
+
+AC_DEFUN([WITH_JDK_SRC_ZIP],
+[
+  AC_MSG_CHECKING(for a JDK source zip)
+  AC_ARG_WITH([jdk-src-zip],
+              [AS_HELP_STRING(--with-jdk-src-zip,specify the location of the jdk source zip)],
+  [
+    ALT_JDK_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test x = x)
+  ],
+  [ 
+    ALT_JDK_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JDK_SRC_ZIP})
+  AC_SUBST(ALT_JDK_SRC_ZIP)
+])
+
+AC_DEFUN([WITH_LANGTOOLS_SRC_ZIP],
+[
+  AC_MSG_CHECKING(for a langtools source zip)
+  AC_ARG_WITH([langtools-src-zip],
+              [AS_HELP_STRING(--with-langtools-src-zip,specify the location of the langtools source zip)],
+  [
+    ALT_LANGTOOLS_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test x = x)
+  ],
+  [ 
+    ALT_LANGTOOLS_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_LANGTOOLS_SRC_ZIP})
+  AC_SUBST(ALT_LANGTOOLS_SRC_ZIP)
+])
+
 AC_DEFUN([ENABLE_HG],
 [
   AC_MSG_CHECKING(whether to retrieve the source code from Mercurial)

--- a/configure.ac	Thu May 07 14:15:56 2009 +0100
+++ b/configure.ac	Thu May 07 16:58:42 2009 +0100
@@ -273,6 +273,11 @@
 FIND_RHINO_JAR
 WITH_OPENJDK_SRC_ZIP
 WITH_HOTSPOT_SRC_ZIP
+WITH_CORBA_SRC_ZIP
+WITH_JAXP_SRC_ZIP
+WITH_JAXWS_SRC_ZIP
+WITH_JDK_SRC_ZIP
+WITH_LANGTOOLS_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 WITH_ALT_JAR_BINARY
 AC_CHECK_ENABLE_CACAO