Bug 634807 - Remove MOZ_PLAINTEXT_EDITOR_ONLY; r=khuey

config/autoconf.mk.in

@@ -121,7 +121,6 @@ USE_ELF_HACK = @USE_ELF_HACK@
 INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
 MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
-MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
 MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
 ENABLE_TESTS	= @ENABLE_TESTS@

configure.in

@@ -4982,7 +4982,6 @@ VPX_ARM_ASM=
 MOZ_PANGO=1
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
-MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
@@ -5921,19 +5920,6 @@ if test "$OS_ARCH" != "WINCE" -a "$OS_ARCH" != "WINNT" -a "$MOZ_USE_NATIVE_UCONV
 fi
 
 
-dnl ========================================================
-dnl Libeditor can be build as plaintext-only,
-dnl or as a full html and text editing component.
-dnl We build both by default.
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(plaintext-editor-only,
-[  --enable-plaintext-editor-only
-                          Allow only plaintext editing],
-    MOZ_PLAINTEXT_EDITOR_ONLY=1,
-    MOZ_PLAINTEXT_EDITOR_ONLY= )
-dnl Note the #define is MOZILLA, not MOZ, for compat with the Mac build.
-AC_SUBST(MOZ_PLAINTEXT_EDITOR_ONLY)
-
 dnl ========================================================
 dnl = Disable Fast Load
 dnl ========================================================

editor/composer/Makefile.in

@@ -42,11 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public
-
-ifndef MOZ_PLAINTEXT_EDITOR_ONLY
-DIRS		+= src
-endif
+DIRS		= public src
 
 ifdef ENABLE_TESTS
 DIRS		+= test

editor/libeditor/Makefile.in

@@ -42,13 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-HTML_DIR	= 
-else
-HTML_DIR	= html
-endif
-
-DIRS		= base text $(HTML_DIR)
+DIRS		= base text html
 
 
 include $(topsrcdir)/config/rules.mk

layout/build/Makefile.in

@@ -121,6 +121,8 @@ SHARED_LIBRARY_LIBS = \
 	$(DEPTH)/editor/libeditor/base/$(LIB_PREFIX)editorbase_s.$(LIB_SUFFIX) \
 	$(DEPTH)/parser/html/$(LIB_PREFIX)html5p_s.$(LIB_SUFFIX) \
 	$(DEPTH)/caps/src/$(LIB_PREFIX)caps_s.$(LIB_SUFFIX) \
+	$(DEPTH)/editor/libeditor/html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX) \
+	$(DEPTH)/editor/txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
@@ -254,15 +256,6 @@ SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-DEFINES += -DMOZILLA_PLAINTEXT_EDITOR_ONLY
-else
-SHARED_LIBRARY_LIBS += \
-	$(DEPTH)/editor/libeditor/html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX) \
-	$(DEPTH)/editor/txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
-	$(NULL)
-endif
-
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 endif

toolkit/library/libxul-config.mk

@@ -154,6 +154,7 @@ COMPONENT_LIBS += \
 	pipboot \
 	pipnss \
 	appcomps \
+	composer \
 	$(NULL)
 
 ifdef MOZ_IPC
@@ -232,12 +233,6 @@ COMPONENT_LIBS += universalchardet
 DEFINES += -DMOZ_UNIVERSALCHARDET
 endif
 
-ifndef MOZ_PLAINTEXT_EDITOR_ONLY
-COMPONENT_LIBS += composer
-else
-DEFINES += -DMOZ_PLAINTEXT_EDITOR_ONLY
-endif
-
 ifdef MOZ_RDF
 COMPONENT_LIBS += \
 	rdf \

toolkit/library/nsStaticXULComponents.cpp

@@ -97,12 +97,6 @@
 #define RDF_MODULES
 #endif
 
-#ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-#define COMPOSER_MODULE
-#else
-#define COMPOSER_MODULE MODULE(nsComposerModule)
-#endif
-
 #ifdef ACCESSIBILITY
 #define ACCESS_MODULES MODULE(nsAccessibilityModule)
 #else
@@ -266,7 +260,7 @@
     ACCESS_MODULES                           \
     MODULE(appshell)                         \
     MODULE(nsTransactionManagerModule)       \
-    COMPOSER_MODULE                          \
+    MODULE(nsComposerModule)                 \
     MODULE(application)                      \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \