Add --disable-plugins build option.

Bug #266750 r=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@164696 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/config/autoconf.mk.in

@@ -143,6 +143,7 @@ CookieManagement=1
 SingleSignon=1
 
 MOZ_OJI		= @MOZ_OJI@
+MOZ_PLUGINS	= @MOZ_PLUGINS@
 
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@

mozilla/configure.in

@@ -3829,6 +3829,15 @@ MOZ_ARG_DISABLE_BOOL(jsd,
     MOZ_JSDEBUGGER=1)
 
 
+dnl ========================================================
+dnl = Disable plugin support
+dnl ========================================================
+MOZ_PLUGINS=1
+MOZ_ARG_DISABLE_BOOL(plugins,
+[  --disable-plugins       Disable plugins support],
+    MOZ_PLUGINS=,
+    MOZ_PLUGINS=1)
+
 dnl ========================================================
 dnl = Open JVM Interface (OJI) support
 dnl ========================================================
@@ -5726,6 +5735,7 @@ AC_SUBST(MOZ_EXTENSIONS)
 AC_SUBST(MOZ_IMG_DECODERS)
 AC_SUBST(MOZ_JSDEBUGGER)
 AC_SUBST(MOZ_OJI)
+AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(ENABLE_EAZEL_PROFILER)
 AC_SUBST(EAZEL_PROFILER_CFLAGS)
 AC_SUBST(EAZEL_PROFILER_LIBS)

mozilla/modules/plugin/Makefile.in

@@ -44,7 +44,10 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
 
-DIRS		= base/public base/src 
+DIRS		= base/public 
+
+ifdef MOZ_PLUGINS
+DIRS		+= base/src 
 
 ifneq (,$(filter gtk gtk2 xlib ,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		+= samples/unixprinting
@@ -87,10 +90,14 @@ DIRS		+= tools/sdk
 endif
 endif
 
+endif # MOZ_PLUGINS
+
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_PLUGINS
 $(DIST)/bin/plugins:
 	$(NSINSTALL) -D $@
 
 export:: $(DIST)/bin/plugins
 
+endif

mozilla/modules/plugin/base/public/Makefile.in

@@ -100,5 +100,10 @@ ifeq ($(OS_ARCH),OS2)
 XPIDLSRCS += nsILegacyPluginWrapperOS2.idl
 endif
 
+# Just build headers if we don't want plugins support
+ifndef MOZ_PLUGINS
+NO_GEN_XPT=1
+endif
+
 include $(topsrcdir)/config/rules.mk