Bug 647118 - Remove support for --disable-plugins. r=glandium

config/autoconf.mk.in

@@ -224,8 +224,6 @@ ClientWallet=1
 CookieManagement=1
 SingleSignon=1
 
-MOZ_PLUGINS	= @MOZ_PLUGINS@
-
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 

configure.in

@@ -4982,7 +4982,6 @@ LIBJPEG_TURBO_X64_ASM=
 MOZ_PANGO=1
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
-MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
@@ -5853,14 +5852,6 @@ fi
 
 AC_SUBST(MOZ_IPDL_TESTS)
 
-dnl ========================================================
-dnl = Disable plugin support
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(plugins,
-[  --disable-plugins       Disable plugins support],
-    MOZ_PLUGINS=,
-    MOZ_PLUGINS=1)
-
 dnl ========================================================
 dnl = Disable building dbm
 dnl ========================================================
@@ -9058,7 +9049,6 @@ AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(MOZ_EXTENSIONS)
 AC_SUBST(MOZ_JSDEBUGGER)
-AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(MOZ_LOG_REFCNT)
 AC_SUBST(MOZ_LEAKY)
 AC_SUBST(MOZ_JPROF)

modules/plugin/Makefile.in

@@ -35,19 +35,19 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH = ../..
-topsrcdir	= @top_srcdir@
+topsrcdir = @top_srcdir@
-srcdir		= @srcdir@
+srcdir = @srcdir@
-VPATH		= @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= plugin
+MODULE = plugin
 
-DIRS		= base/public 
+DIRS = \
-
+  base/public \
-ifdef MOZ_PLUGINS
+  base/src \
-DIRS		+= base/src 
+  $(NULL)
 
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
@@ -58,14 +58,9 @@ DIRS += test
 endif
 endif
 
-endif # MOZ_PLUGINS
-
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_PLUGINS
 $(DIST)/bin/plugins:
 	$(NSINSTALL) -D $@
 
 export:: $(DIST)/bin/plugins
-
-endif

modules/plugin/base/public/Makefile.in

@@ -35,49 +35,43 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH = ../../../..
-topsrcdir	= @top_srcdir@
+topsrcdir = @top_srcdir@
-srcdir		= @srcdir@
+srcdir = @srcdir@
-VPATH		= @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= plugin
+MODULE = plugin
-GRE_MODULE	= 1
+GRE_MODULE = 1
 
-EXPORTS		= \
+EXPORTS = \
-		nsPluginLogging.h \
+  nsPluginLogging.h \
-		nsPluginError.h \
+  nsPluginError.h \
-		nsPluginNativeWindow.h \
+  nsPluginNativeWindow.h \
-		nsPluginsCID.h \
+  nsPluginsCID.h \
-		$(NULL)
+  $(NULL)
 
-SDK_HEADERS	 = \
+SDK_HEADERS = \
-		npapi.h \
+  npapi.h \
-		npfunctions.h \
+  npfunctions.h \
-		nptypes.h \
+  nptypes.h \
-		npruntime.h \
+  npruntime.h \
-		$(NULL)
+  $(NULL)
 
-XPIDLSRCS 	= \
+XPIDLSRCS = \
-		nspluginroot.idl \
+  nsIHTTPHeaderListener.idl \
-		nsIPluginStreamInfo.idl \
+  nsIPlugin.idl \
-		nsIPluginInstanceOwner.idl \
+  nsIPluginDocument.idl \
-		nsIPlugin.idl \
+  nsIPluginHost.idl \
-		nsIHTTPHeaderListener.idl \
+  nsIPluginInputStream.idl \
-		nsIPluginTag.idl \
+  nsIPluginInstance.idl \
-		nsIPluginTagInfo.idl \
+  nsIPluginInstanceOwner.idl \
-		nsIPluginInputStream.idl \
+  nsIPluginStreamInfo.idl \
-		nsIPluginStreamListener.idl \
+  nsIPluginStreamListener.idl \
-		nsIPluginInstance.idl \
+  nsIPluginTag.idl \
-		nsIPluginHost.idl \
+  nsIPluginTagInfo.idl \
-		nsIPluginDocument.idl \
+  nspluginroot.idl \
-		$(NULL)
+  $(NULL)
-
-# Just build headers if we don't want plugins support
-ifndef MOZ_PLUGINS
-NO_GEN_XPT=1
-endif
 
 include $(topsrcdir)/config/rules.mk
-

testing/mochitest/Makefile.in

@@ -213,6 +213,4 @@ stage-package:
 	@(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -)
 	@(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
 	@(cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/certs && tar -xf -)
-ifdef MOZ_PLUGINS
 	@(cd $(DIST_BIN)/plugins && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_PLUGINS)) | (cd $(PKG_STAGE)/bin/plugins && tar -xf -)
-endif

toolkit/library/libxul-config.mk

@@ -164,14 +164,10 @@ COMPONENT_LIBS += \
 	$(NULL)
 endif
 
-COMPONENT_LIBS += jsperf
-
-ifdef MOZ_PLUGINS
-DEFINES += -DMOZ_PLUGINS
 COMPONENT_LIBS += \
-	gkplugin \
+  jsperf \
-	$(NULL)
+  gkplugin \
-endif
+  $(NULL)
 
 ifdef MOZ_XUL
 ifdef MOZ_ENABLE_GTK2

toolkit/library/nsStaticXULComponents.cpp

@@ -134,12 +134,8 @@
 #define JETPACK_MODULES
 #endif
 
-#ifdef MOZ_PLUGINS
 #define PLUGINS_MODULES \
     MODULE(nsPluginModule)
-#else
-#define PLUGINS_MODULES
-#endif
 
 #ifdef MOZ_JSDEBUGGER
 #define JSDEBUGGER_MODULES \

toolkit/mozapps/extensions/Makefile.in

@@ -41,8 +41,7 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE       = extensions
+MODULE = extensions
-XPIDL_MODULE = extensions
 
 XPIDLSRCS = \
   amIInstallTrigger.idl \
@@ -59,18 +58,14 @@ EXTRA_PP_COMPONENTS = \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
+  AddonLogging.jsm \
   AddonManager.jsm \
   AddonRepository.jsm \
-  XPIProvider.jsm \
   AddonUpdateChecker.jsm \
-  AddonLogging.jsm \
+  PluginProvider.jsm \
+  XPIProvider.jsm \
   $(NULL)
 
-ifdef MOZ_PLUGINS
-  EXTRA_PP_JS_MODULES += PluginProvider.jsm
-  DEFINES += -DMOZ_PLUGINS
-endif
-
 EXTRA_JS_MODULES = \
   LightweightThemeManager.jsm \
   $(NULL)
@@ -80,9 +75,9 @@ DIRS += test
 endif
 
 EXTRA_DSO_LDOPTS = \
-		$(MOZ_JS_LIBS) \
+  $(MOZ_JS_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
+  $(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
+  $(MOZ_COMPONENT_LIBS) \
-		$(NULL)
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/mozapps/extensions/extensions.manifest

@@ -8,6 +8,4 @@ component {7beb3ba8-6ec3-41b4-b67c-da89b8518922} amContentHandler.js
 contract @mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall {7beb3ba8-6ec3-41b4-b67c-da89b8518922}
 component {0f38e086-89a3-40a5-8ffc-9b694de1d04a} amWebInstallListener.js
 contract @mozilla.org/addons/web-install-listener;1 {0f38e086-89a3-40a5-8ffc-9b694de1d04a}
-#ifdef MOZ_PLUGINS
 category addon-provider-module PluginProvider resource://gre/modules/PluginProvider.jsm
-#endif