On 19.10.2009 19:42, Andrew Haley wrote:
Ian Lance Taylor wrote:
Andrew Haley<a...@redhat.com> writes:
Matthias Klose wrote:
--enable-plugin is used by classpath (part of libjava) and now by GCC
itself. disabling the build of the gcjwebplugin now disables plugin
support in GCC as well. Please could the option for enabling GCC plugin
support be renamed to something like --enable-plugins,
--enable-gcc-plugin, --enable-gcc-plugins ? The only reason for not
renaming the existing libjava option is that it was there first, and
that it is part of an imported tree.
That doesn't seem like a good enough reason to me. We should rename
the libjava option --enable-web-plugin or --enable-browser-plugin .
We could rename in the top leve configure/Makefile if we don't want to
touch the classpath sources.
That sounds like a nice solution.
it's not necessary to do this at toplevel, changing libjava is ok. tested with
--enable-plugin --disable-browser-plugin, and --disable-plugin and
--enable-browser-plugin.
Ok for the trunk?
Matthias
gcc/
2009-10-22 Matthias Klose <d...@ubuntu.com>
* doc/install.texi: Document --enable-browser-plugin.
libjava/
2009-10-22 Matthias Klose <d...@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"
