changeset in /hg/icedtea: Merge enable patch to IcedTea.

[gnu_andrew at member.fsf.org]

changeset ccaf170c726a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ccaf170c726a
description:
	Merge enable patch to IcedTea.

diffstat:

3 files changed, 11 insertions(+), 4 deletions(-)
ChangeLog    |    7 +++++++
configure    |    4 ++--
configure.ac |    4 ++--

diffs (54 lines):

diff -r 6c09e539511d -r ccaf170c726a ChangeLog
--- a/ChangeLog	Thu May 29 23:43:22 2008 +0100
+++ b/ChangeLog	Fri May 30 01:16:24 2008 +0100
@@ -1,3 +1,10 @@ 2008-05-29  Andrew John Hughes  <gnu_and
+2008-05-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* aclocal.m4,
+	* configure: Regenerated.
+	* configure.ac: Use enableval
+	with --enable options.
+
 2008-05-29  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
diff -r 6c09e539511d -r ccaf170c726a configure
--- a/configure	Thu May 29 23:43:22 2008 +0100
+++ b/configure	Fri May 30 01:16:24 2008 +0100
@@ -5869,7 +5869,7 @@ fi
 
 # Check whether --enable-gcjwebplugin was given.
 if test "${enable_gcjwebplugin+set}" = set; then
-  enableval=$enable_gcjwebplugin; ENABLE_PLUGIN="$val"
+  enableval=$enable_gcjwebplugin; ENABLE_PLUGIN="${enableval}"
 else
   ENABLE_PLUGIN='yes'
 fi
@@ -5878,7 +5878,7 @@ fi
 
 # Check whether --enable-docs was given.
 if test "${enable_docs+set}" = set; then
-  enableval=$enable_docs; ENABLE_DOCS="$val"
+  enableval=$enable_docs; ENABLE_DOCS="${enableval}"
 else
   ENABLE_DOCS='yes'
 fi
diff -r 6c09e539511d -r ccaf170c726a configure.ac
--- a/configure.ac	Thu May 29 23:43:22 2008 +0100
+++ b/configure.ac	Fri May 30 01:16:24 2008 +0100
@@ -101,13 +101,13 @@ AC_ARG_ENABLE([gcjwebplugin],
 AC_ARG_ENABLE([gcjwebplugin],
 	      [AS_HELP_STRING([--disable-gcjwebplugin], 
 	      		      [Disable compilation of browser plugin])],
-	      [ENABLE_PLUGIN="$val"], [ENABLE_PLUGIN='yes'])
+	      [ENABLE_PLUGIN="${enableval}"], [ENABLE_PLUGIN='yes'])
 AC_SUBST(ENABLE_PLUGIN)
 
 AC_ARG_ENABLE([docs],
 	      [AS_HELP_STRING([--disable-docs], 
 	      		      [Disable generation of documentation])],
-	      [ENABLE_DOCS="$val"], [ENABLE_DOCS='yes'])
+	      [ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes'])
 AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
 
 AC_ARG_WITH([icedtea],