/hg/icedtea6: Don't abuse DEFAULT_BUILD in the HotSpot build macro.

[andrew at icedtea.classpath.org]

changeset 0bfb4898c039 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0bfb4898c039
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 20 14:45:55 2010 +0100

	Don't abuse DEFAULT_BUILD in the HotSpot build macro.

	2010-10-19 Andrew John Hughes <ahughes at redhat.com>

	 * INSTALL: Clarify HotSpot build documentation.
		* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Don't abuse
	DEFAULT_BUILD. Introduce ORIGINAL_BUILD to represent the
	ORIGINAL BUILD and use that in the conditional and for
	--without-hotspot-build. Use DEFAULT_BUILD only for when the
	option is not specified.


diffstat:

3 files changed, 19 insertions(+), 6 deletions(-)
ChangeLog    |   11 +++++++++++
INSTALL      |    5 +++--
acinclude.m4 |    9 +++++----

diffs (62 lines):

diff -r 5327c5405c78 -r 0bfb4898c039 ChangeLog
--- a/ChangeLog	Tue Oct 19 21:27:47 2010 +0100
+++ b/ChangeLog	Wed Oct 20 14:45:55 2010 +0100
@@ -1,3 +1,14 @@ 2010-10-19  Andrew John Hughes  <ahughes
+2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* INSTALL: Clarify HotSpot build documentation.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HOTSPOT_BUILD): Don't abuse
+	DEFAULT_BUILD.  Introduce ORIGINAL_BUILD to
+	represent the ORIGINAL BUILD and use that in
+	the conditional and for --without-hotspot-build.
+	Use DEFAULT_BUILD only for when the option is
+	not specified.
+
 2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* INSTALL: Drop plugin dependencies.
diff -r 5327c5405c78 -r 0bfb4898c039 INSTALL
--- a/INSTALL	Tue Oct 19 21:27:47 2010 +0100
+++ b/INSTALL	Wed Oct 20 14:45:55 2010 +0100
@@ -308,8 +308,9 @@ revert to the version of hs17 provided i
 revert to the version of hs17 provided in b20.  Note that the norm. is
 for up to one alternate (non-default) build to be supported and just
 passing --with-hotspot-build (equivalent to --with-hotspot-build=yes)
-will provide the opposite to the default HotSpot (currently hs17, 'original').
-Conversely, passing --with-hotspot-build=no retains the default.
+will always provide the alternate build (currently hs19).  Conversely,
+passing --with-hotspot-build=no provides the original build (currently
+hs17).
 
 Javascript Support
 ==================
diff -r 5327c5405c78 -r 0bfb4898c039 acinclude.m4
--- a/acinclude.m4	Tue Oct 19 21:27:47 2010 +0100
+++ b/acinclude.m4	Wed Oct 20 14:45:55 2010 +0100
@@ -917,8 +917,9 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
 
 AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
 [
-  DEFAULT_BUILD="hs19"
-  ALTERNATE_BUILD="original"
+  ORIGINAL_BUILD="original"
+  ALTERNATE_BUILD="hs19"
+  DEFAULT_BUILD=${ALTERNATE_BUILD}
   AC_MSG_CHECKING([which HotSpot build to use])
   AC_ARG_WITH([hotspot-build],
 	      [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
@@ -931,11 +932,11 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
   if test "x${HSBUILD}" = xyes; then
 	HSBUILD="${ALTERNATE_BUILD}"
   elif test "x${HSBUILD}" = xno; then
-	HSBUILD="${DEFAULT_BUILD}"
+	HSBUILD="${ORIGINAL_BUILD}"
   fi
   AC_MSG_RESULT([${HSBUILD}])
   AC_SUBST([HSBUILD])
-  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "x${DEFAULT_BUILD}")
+  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "x${ORIGINAL_BUILD}")
 ])
 
 AC_DEFUN([WITH_HOTSPOT_SRC_ZIP],