Support using code from the closures or CVMI project

[Andrew John Hughes]

This allows the Mercurial URL used by the IcedTea (7) project
to be changed to either that of the closures (--enable-closures)
or CVMI (--enable-cvmi) project, so these codebases can be built instead.

ChangeLog:

2008-07-27  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Add closures and cvmi URL and support
	using them when downloading from Mercurial.
	* acinclude.m4:
	(ENABLE_EXTRA_PROJECTS): Added.
	* configure.ac:
	Enable tests for extra projects and
	correct Mercurial test.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 471b9b923eb5 Makefile.am
--- a/Makefile.am	Wed Jul 23 11:25:20 2008 -0400
+++ b/Makefile.am	Sun Jul 27 22:28:41 2008 +0100
@@ -254,6 +254,8 @@
 # Download OpenJDK sources.
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
+CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
+CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
 
 OPENJDK_URL = http://www.java.net/download/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
 
@@ -286,8 +288,16 @@
           echo "No forest extension found. Please refer to" \
             "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
           exit 1; \
-          fi; \
-	hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk; 
+          fi;
+if USE_CLOSURES
+	hg fclone $(CLOSURES_HG_URL) openjdk; 
+else
+if USE_CVMI
+	hg fclone $(CVMI_HG_URL) openjdk; 
+else
+	hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
+endif
+endif
 else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
diff -r 471b9b923eb5 acinclude.m4
--- a/acinclude.m4	Wed Jul 23 11:25:20 2008 -0400
+++ b/acinclude.m4	Sun Jul 27 22:28:41 2008 +0100
@@ -790,10 +790,10 @@
   [
     case "${enableval}" in
       no)
-        enable_hg=yes
+	enable_hg=no
         ;;
       *)
-        enable_hg=no
+        enable_hg=yes
         ;;
     esac
   ],
@@ -803,3 +803,43 @@
   AC_MSG_RESULT([${enable_hg}])
   AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes")
 ])
+
+AC_DEFUN([ENABLE_EXTRA_PROJECTS],
+[
+  AC_MSG_CHECKING(whether to use code from the Closures project)
+  AC_ARG_ENABLE([closures],
+                [AS_HELP_STRING(--enable-closures,use Closures source code [[default=no]])],
+  [
+    case "${enableval}" in
+      no)
+	enable_closures=no
+        ;;
+      *)
+        enable_closures=yes
+        ;;
+    esac
+  ],
+  [
+    enable_closures=no
+  ])
+  AC_MSG_RESULT([${enable_closures}])
+  AM_CONDITIONAL([USE_CLOSURES], test x"${enable_closures}" = "xyes")
+  AC_MSG_CHECKING(whether to use code from the CVMI project)
+  AC_ARG_ENABLE([cvmi],
+                [AS_HELP_STRING(--enable-cvmi,use CVMI source code [[default=no]])],
+  [
+    case "${enableval}" in
+      no)
+	enable_cvmi=no
+        ;;
+      *)
+        enable_cvmi=yes
+        ;;
+    esac
+  ],
+  [
+    enable_cvmi=no
+  ])
+  AC_MSG_RESULT([${enable_cvmi}])
+  AM_CONDITIONAL([USE_CVMI], test x"${enable_cvmi}" = "xyes")
+])
diff -r 471b9b923eb5 configure.ac
--- a/configure.ac	Wed Jul 23 11:25:20 2008 -0400
+++ b/configure.ac	Sun Jul 27 22:28:41 2008 +0100
@@ -215,8 +215,9 @@
 ENABLE_ZERO_BUILD
 SET_CORE_OR_SHARK_BUILD
 ENABLE_HG
+ENABLE_EXTRA_PROJECTS
 
-if test "$ALT_OPENJDK_SRC_ZIP" = "not specified"; then
+if test "x${enable_hg}" = "xyes"; then
   FIND_TOOL([MERCURIAL],[hg])
 fi