/hg/icedtea6: Cleanup the IT_CHECK_WITH_JAMVM_SRC_ZIP macro and ...

[andrew at icedtea.classpath.org]

changeset d066d5778104 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d066d5778104
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 17:05:16 2011 +0000

	Cleanup the IT_CHECK_WITH_JAMVM_SRC_ZIP macro and document it in
	INSTALL.

	2011-02-23 Andrew John Hughes <ahughes at redhat.com>

	 * INSTALL: Mention --with-alt-jamvm-src-zip.
		* acinclude.m4: (IT_CHECK_WITH_JAMVM_SRC_ZIP): Use a single
	AM_CONDITIONAL. Check that the specified value is a valid
	file using test.


diffstat:

3 files changed, 15 insertions(+), 3 deletions(-)
ChangeLog    |    8 ++++++++
INSTALL      |    4 +++-
acinclude.m4 |    6 ++++--

diffs (56 lines):

diff -r a4352c2385ef -r d066d5778104 ChangeLog
--- a/ChangeLog	Wed Feb 23 17:26:18 2011 +0100
+++ b/ChangeLog	Wed Feb 23 17:05:16 2011 +0000
@@ -1,3 +1,11 @@ 2011-02-23  Xerxes Ranby  <xerxes at zafena
+2011-02-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* INSTALL: Mention --with-alt-jamvm-src-zip.
+	* acinclude.m4:
+	(IT_CHECK_WITH_JAMVM_SRC_ZIP): Use a single
+	AM_CONDITIONAL.  Check that the specified value
+	is a valid file using test.
+
 2011-02-23  Xerxes Ranby  <xerxes at zafena.se>
 
 	JamVM: configure --with-jamvm-src-zip
diff -r a4352c2385ef -r d066d5778104 INSTALL
--- a/INSTALL	Wed Feb 23 17:26:18 2011 +0100
+++ b/INSTALL	Wed Feb 23 17:05:16 2011 +0000
@@ -152,6 +152,7 @@ to configure:
   and building one.
 * --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading.
 * --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading.
+* --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
 * --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
 * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
@@ -262,7 +263,8 @@ IcedTea6 can use JamVM as the virtual ma
 IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot.
 When --enable-jamvm is specified, JamVM will be downloaded and built,
 followed by the JDK portion of OpenJDK resulting in a JamVM+OpenJDK
-image in openjdk/build/<os>-<arch>/j2sdk-image.
+image in openjdk/build/<os>-<arch>/j2sdk-image.  The
+--with-jamvm-src-zip option exists to allow the use of a pre-downloaded zip.
 
 Zero & Shark
 ============
diff -r a4352c2385ef -r d066d5778104 acinclude.m4
--- a/acinclude.m4	Wed Feb 23 17:26:18 2011 +0100
+++ b/acinclude.m4	Wed Feb 23 17:05:16 2011 +0000
@@ -882,12 +882,14 @@ AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP],
 	      [AS_HELP_STRING(--with-jamvm-src-zip,specify the location of the JamVM source zip)],
   [
     ALT_JAMVM_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x = x)
+    if ! test -f ${ALT_JAMVM_SRC_ZIP} ; then
+      AC_MSG_ERROR([Invalid JamVM source zip specified: ${ALT_JAMVM_SRC_ZIP}])
+    fi
   ],
   [
     ALT_JAMVM_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x != x)
   ])
+  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)
 ])