gcc/

2009-10-22  Matthias Klose  <doko@ubuntu.com>

	* doc/install.texi: Document --enable-browser-plugin.

libjava/

2009-10-22  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Rename --enable-plugin to --enable-browser-plugin,
	pass --{en,dis}able-plugin to the classpath configure.
	* configure: Regenerate.


Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 153445)
+++ gcc/doc/install.texi	(working copy)
@@ -1882,6 +1884,9 @@
 @item --enable-aot-compile-rpm
 Adds aot-compile-rpm to the list of installed scripts.
 
+@item --enable-browser-plugin
+Build the gcjwebplugin web browser plugin.
+
 @table @code
 @item ansi
 Use the single-byte @code{char} and the Win32 A functions natively,

Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 153445)
+++ libjava/configure.ac	(working copy)
@@ -55,15 +55,15 @@
     [version_specific_libs=no]
 )
 
-AC_ARG_ENABLE(plugin,
-  AS_HELP_STRING([--enable-plugin],
+AC_ARG_ENABLE(browser-plugin,
+  AS_HELP_STRING([--enable-browser-plugin],
                  [build gcjwebplugin web browser plugin]),
     [case "$enableval" in
-      yes) plugin_enabled=yes ;;
-      no)  plugin_enabled=no ;;
-      *)   AC_MSG_ERROR([Unknown argument to enable/disable plugin]);;
+      yes) browser_plugin_enabled=yes ;;
+      no)  browser_plugin_enabled=no ;;
+      *)   AC_MSG_ERROR([Unknown argument to enable/disable browser plugin]);;
      esac],
-    [plugin_enabled=no]
+    [browser_plugin_enabled=no]
 )
 
 AC_ARG_ENABLE(gconf-peer,
@@ -491,8 +491,10 @@
 dnl FIXME?
 ac_configure_args="$ac_configure_args --disable-examples"
 ac_configure_args="$ac_configure_args --with-glibj=build"
-if test "$plugin_enabled" != yes; then
+if test "$browser_plugin_enabled" != yes; then
   ac_configure_args="$ac_configure_args --disable-plugin"
+else
+  ac_configure_args="$ac_configure_args --enable-plugin"
 fi
 if test "$gconf_enabled" != yes; then
   ac_configure_args="$ac_configure_args --disable-gconf-peer"