Mercurial > hg > release > icedtea6-1.7
changeset 1965:c0a3d1ecb3ae
Turn off the old plugin by default so both it and the new plugin aren't turned on by default.
2010-07-26 Andrew John Hughes <ahughes@redhat.com>
* INSTALL: Update plugin documentation.
* acinclude.m4: Turn off the old plugin
(--disable-plugin) by default.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 26 Jul 2010 23:18:42 +0100 |
| parents | 5760b0bf92c2 |
| children | e5dc3c88292c |
| files | ChangeLog INSTALL acinclude.m4 |
| diffstat | 3 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jul 26 22:01:25 2010 +0100 +++ b/ChangeLog Mon Jul 26 23:18:42 2010 +0100 @@ -1,3 +1,9 @@ +2010-07-26 Andrew John Hughes <ahughes@redhat.com> + + * INSTALL: Update plugin documentation. + * acinclude.m4: Turn off the old plugin + (--disable-plugin) by default. + 2010-07-26 Andrew John Hughes <ahughes@redhat.com> * configure.ac: Bump to 1.7.4
--- a/INSTALL Mon Jul 26 22:01:25 2010 +0100 +++ b/INSTALL Mon Jul 26 23:18:42 2010 +0100 @@ -31,7 +31,7 @@ libpng-devel libjpeg-devel >= 6b zlib-devel -xulrunner-devel (can be disabled using --disable-plugin) +xulrunner-devel (can be disabled using --disable-npplugin) rhino (can be disabled using --without-rhino) libffi (for --enable-zero or on archs other than x86/x86_64/sparc) pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) @@ -162,7 +162,7 @@ * --enable-cacao: Replace HotSpot with the CACAO VM. * --enable-shark: Build the Shark LLVM-based JIT. * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms. -* --disable-plugin: Don't build the browser plugin. +* --enable-plugin: Build the old browser plugin. * --disable-npplugin: Build the old unsupported plugin rather than NPPlugin. * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK. * --with-rhino: Include Javascript support using Rhino. @@ -281,10 +281,11 @@ IcedTea6 currently includes two browser plugins; a new supported plugin based on NPRuntime and an older deprecated plugin used in -previous releases. By default, the first will be built and this -is the recommended option. Passing the option --disable-npplugin -reverts to the old plugin, while --disable-plugin turns off the -build of a browser plugin altogether. +previous releases. By default, the first will be built and this is +the recommended option. Passing the option --disable-npplugin turns +off the build of a browser plugin altogether, while --disable-npplugin +--enable-plugin will build the old unsupported plugin, which won't work +with xulrunner 1.9.2 or later. A test suite is supplied for the browser plugin. It can be built using 'make plugin-tests' and run by loading the HTML page specified
--- a/acinclude.m4 Mon Jul 26 22:01:25 2010 +0100 +++ b/acinclude.m4 Mon Jul 26 23:18:42 2010 +0100 @@ -1262,9 +1262,9 @@ [ AC_MSG_CHECKING([whether to build the browser plugin]) AC_ARG_ENABLE([plugin], - [AS_HELP_STRING([--disable-plugin], - [Disable compilation of browser plugin])], - [enable_plugin="${enableval}"], [enable_plugin="yes"]) + [AS_HELP_STRING([--enable-plugin], + [Enable compilation of the old browser plugin])], + [enable_plugin="${enableval}"], [enable_plugin="no"]) AC_MSG_RESULT(${enable_plugin}) ])