Allow NetX to be disabled. 2010-11-18 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (NETX_DIR): Define only when NetX is enabled and set to syntax for jar (like LIVECONNECT_DIR). (ICEDTEA_PATCHES): Only apply icedtea-webstart.patch, icedtea-copy-plugs.patch and icedtea-webstart-umask.patch if NetX is enabled. Add snmp.patch, getannotation-cast.patch and applet_hole.patch which have been split out from these conditional patches. (ICEDTEA_ECJ_PATCHES): Drop icedtea-ant.patch, redundant. (ICEDTEA_ENV): Only add IMPORT_BINARY_PLUGS and ALT_BINARY_PLUGS_PATH if NetX is enabled. (distclean-local): Add clean-about. (.PHONY): Likewise. (icedtea): Depend on about.stamp. Add ENABLE_NETX conditional. (icedtea-debug): Likewise. (netx): Add ENABLE_NETX conditional. (netx-dist): Likewise. (extra-class-files): Likewise. (about): New target (from extra-lib/about.jar). Add ENABLE_NETX conditional. (clean-about): New target to remove about.jar. (rt-source-files): Filter out NetX sources if not building NetX. (rt-class-files): Only add NetX resources if building NetX. (rt): Replace '-C lib/rt net' with NETX_DIR so NetX sources are only included if NetX is enabled. * acinclude.m4: (IT_CHECK_OLD_PLUGIN): Remove outdated version warning about old plugin. (IT_CHECK_PLUGIN_DEPENDENCIES): Require IT_CHECK_NETX. Disable both plugins if NetX is turned off. (IT_CHECK_NETX): Add --disable-webstart option. * patches/ecj/icedtea-ant.patch: Dropped. Was wrongly applied to openjdk, not openjdk-ecj and breaks when netx is turned off. * patches/icedtea-copy-plugs.patch: Only include segments related to plug installation and apply only when building NetX. * patches/getannotation-cast.patch, * patches/snmp.patch: New patches broken out from copy-plugs.patch which are always applied. * patches/applet_hole.patch: Split applet class patching into separate file to be applied in all builds. * patches/icedtea-webstart.patch: Include only the Makefile additions to build the jaxws binary and documentation.

diff -c openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
--- openjdk.orig/jdk/make/launchers/Makefile	2008-06-29 09:45:56.000000000 -0400
+++ openjdk/jdk/make/launchers/Makefile	2008-06-29 09:47:01.000000000 -0400
@@ -67,6 +67,7 @@
 $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
 $(call make-launcher, javah, com.sun.tools.javah.Main, , )
 $(call make-launcher, javap, sun.tools.javap.Main, , )
+$(call make-launcher, javaws, net.sourceforge.jnlp.runtime.Boot, , )
 $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
   -J-Djconsole.showOutputViewer, )
 $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
--- openjdk/jdk/make/docs/NON_CORE_PKGS.gmk.orig	2009-06-04 11:02:18.000000000 -0400
+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk	2009-06-04 11:02:45.000000000 -0400
@@ -84,6 +84,8 @@
 
 SMARTCARDIO_PKGS = javax.smartcardio
 
+JNLP_PKGS        = javax.jnlp
+
 # non-core packages in rt.jar
 NON_CORE_PKGS    = $(DOMAPI_PKGS) \
                    $(MGMT_PKGS) \
@@ -91,4 +93,5 @@
                    $(JGSS_PKGS) \
                    $(OLD_JSSE_PKGS) \
                    $(HTTPSERVER_PKGS) \
-                   $(SMARTCARDIO_PKGS)
+                   $(SMARTCARDIO_PKGS) \
+                   $(JNLP_PKGS)