FYI: Build fixes

[Andrew John Hughes]

Attached are two build fixes I needed while working
on Gentoo support for some of the new features.

The first allows the basic cluster zip used by VisualVM
to be specified.  The second fixes the naming of the CACAO
option.  As --with-cacao only accepts yes and no, it should
be --enable-cacao as with --enable-shark and --enable-zero.

ChangeLog:

2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* acinclude.m4:
	Change --with-cacao to be --enable-cacao
	as it only accepts yes and no.
	* configure.ac:
	Rename cacao macro appropriately.

2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Make use of ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP.
	* acinclude.m4:
	Add --with-netbeans-basic-cluster-src-zip option.
	* configure.ac:
	Enable WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP macro.

-- 
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 ce3ea0b5a8c9 acinclude.m4
--- a/acinclude.m4	Thu Oct 16 01:28:18 2008 +0100
+++ b/acinclude.m4	Thu Oct 16 01:32:45 2008 +0100
@@ -847,13 +847,13 @@
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
 ])
 
-AC_DEFUN([AC_CHECK_WITH_CACAO],
+AC_DEFUN([AC_CHECK_ENABLE_CACAO],
 [
   AC_MSG_CHECKING(whether to use CACAO as VM)
-  AC_ARG_WITH([cacao],
-	      [AS_HELP_STRING(--with-cacao,use CACAO as VM [[default=no]])],
+  AC_ARG_ENABLE([cacao],
+	      [AS_HELP_STRING(--enable-cacao,use CACAO as VM [[default=no]])],
   [
-    WITH_CACAO=yes
+    WITH_CACAO="${enableval}"
   ],
   [
     WITH_CACAO=no
diff -r ce3ea0b5a8c9 configure.ac
--- a/configure.ac	Thu Oct 16 01:28:18 2008 +0100
+++ b/configure.ac	Thu Oct 16 01:32:45 2008 +0100
@@ -249,7 +249,7 @@
 WITH_NETBEANS_PROFILER_SRC_ZIP
 WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP
 WITH_ALT_JAR_BINARY
-AC_CHECK_WITH_CACAO
+AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
 ENABLE_OPTIMIZATIONS
-------------- next part --------------
diff -r d6d04e2f4333 Makefile.am
--- a/Makefile.am	Wed Oct 15 13:11:21 2008 -0400
+++ b/Makefile.am	Thu Oct 16 01:26:29 2008 +0100
@@ -295,7 +295,12 @@
 endif
 
 NETBEANS_BASIC_CLUSTER_URL = http://nbi.netbeans.org/files/documents/210/2056/
-NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip 
+
+if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
+  NETBEANS_BASIC_CLUSTER_SRC_ZIP = $(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP)
+else
+  NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip 
+endif
 
 NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
 
@@ -343,6 +348,8 @@
 endif
 endif
 if WITH_VISUALVM
+if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
+else
 	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
 	then \
@@ -353,7 +360,7 @@
 	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
 	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
 	fi
-
+endif
 if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
 else
 	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
diff -r d6d04e2f4333 acinclude.m4
--- a/acinclude.m4	Wed Oct 15 13:11:21 2008 -0400
+++ b/acinclude.m4	Thu Oct 16 01:26:29 2008 +0100
@@ -473,6 +473,23 @@
   AC_SUBST(ALT_NETBEANS_PROFILER_SRC_ZIP)
 ])
 
+AC_DEFUN([WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP],
+[
+  AC_MSG_CHECKING(netbeans basic cluster zip)
+  AC_ARG_WITH([netbeans-basic-cluster-src-zip],
+              [AS_HELP_STRING(--with-netbeans-basic-cluster-src-zip, specify the location of the netbeans basic cluster source zip)],
+  [
+    ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP, test x = x)
+  ],
+  [ 
+    ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP})
+  AC_SUBST(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP)
+])
+
 AC_DEFUN([WITH_ALT_JAR_BINARY],
 [
   AC_MSG_CHECKING(alternate jar command)
diff -r d6d04e2f4333 configure.ac
--- a/configure.ac	Wed Oct 15 13:11:21 2008 -0400
+++ b/configure.ac	Thu Oct 16 01:26:29 2008 +0100
@@ -247,6 +247,7 @@
 WITH_OPENJDK_SRC_DIR
 WITH_VISUALVM_SRC_ZIP
 WITH_NETBEANS_PROFILER_SRC_ZIP
+WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP
 WITH_ALT_JAR_BINARY
 AC_CHECK_WITH_CACAO
 AC_CHECK_WITH_CACAO_HOME