From e6d0bdcfb819ce601df0ec29c7a5252ca3cd9b82 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Wed, 30 Sep 1998 00:48:23 +0000 Subject: [PATCH] Replaced checks for NO_EDITOR with checks for MOZ_EDITOR. Removed check for NO_EDITOR from config.mk. Removed EDITOR=1 from config.mk. Set MOZ_EDITOR= ifdef MOZ_LITE. git-svn-id: svn://10.0.0.236/trunk@11507 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/stubfe/Makefile | 6 +++--- mozilla/cmd/stubfe/Makefile.in | 6 +++--- mozilla/cmd/xfe/Makefile.in | 4 ++-- mozilla/config/autoconf.mk.in | 2 +- mozilla/config/config.mk | 6 ------ mozilla/configure.in | 7 +++---- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/mozilla/cmd/stubfe/Makefile b/mozilla/cmd/stubfe/Makefile index 91bda40942c..e605539ea6f 100644 --- a/mozilla/cmd/stubfe/Makefile +++ b/mozilla/cmd/stubfe/Makefile @@ -459,7 +459,7 @@ HPUX_RESOURCE_HACK = -Wp,-H16384 OTHER_LIBS = -L$(DIST)/lib $(OS_LIBS) -ifndef NO_EDITOR +ifdef MOZ_EDITOR EXPORT_DEPLIBS += cxxlink-filter US_DEPLIBS += cxxlink-filter CCLD = CC -tl,./cxxlink-filter @@ -557,7 +557,7 @@ EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS) US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS) -ifndef NO_EDITOR +ifdef MOZ_EDITOR # # OSF's cxx link command will link in _dynamic_ version of two C++ # libraries. This is bad, they are not shipped on a base system. @@ -611,7 +611,7 @@ ifndef NO_WEBFONTS EXTRA_REL_FILES += $(WEBFONT_DSO) endif -ifndef NO_EDITOR +ifdef MOZ_EDITOR OTHER_LIBS += -L/tools/ns/lib # diff --git a/mozilla/cmd/stubfe/Makefile.in b/mozilla/cmd/stubfe/Makefile.in index 883b36eaa77..2e822a401e7 100644 --- a/mozilla/cmd/stubfe/Makefile.in +++ b/mozilla/cmd/stubfe/Makefile.in @@ -482,7 +482,7 @@ HPUX_RESOURCE_HACK = -Wp,-H16384 OTHER_LIBS = -L$(DIST)/lib $(OS_LIBS) -ifndef NO_EDITOR +ifdef MOZ_EDITOR EXPORT_DEPLIBS += cxxlink-filter US_DEPLIBS += cxxlink-filter CCLD = CC -tl,./cxxlink-filter @@ -580,7 +580,7 @@ EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS) US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS) -ifndef NO_EDITOR +ifdef MOZ_EDITOR # # OSF's cxx link command will link in _dynamic_ version of two C++ # libraries. This is bad, they are not shipped on a base system. @@ -634,7 +634,7 @@ ifndef NO_WEBFONTS EXTRA_REL_FILES += $(WEBFONT_DSO) endif -ifndef NO_EDITOR +ifdef MOZ_EDITOR OTHER_LIBS += -L/tools/ns/lib # diff --git a/mozilla/cmd/xfe/Makefile.in b/mozilla/cmd/xfe/Makefile.in index 4ad5ac2f0ff..fd4bde61bac 100644 --- a/mozilla/cmd/xfe/Makefile.in +++ b/mozilla/cmd/xfe/Makefile.in @@ -839,7 +839,7 @@ HPUX_RESOURCE_HACK = -Wp,-H16384 OTHER_LIBS = $(HPUX_XLIBS) -lXm -L$(DIST)/lib -lXmu -lXt -lX11 -lXext $(OS_LIBS) -ifndef NO_EDITOR +ifdef MOZ_EDITOR ifdef NS_USE_GCC CCLD = $(CCC) @@ -1024,7 +1024,7 @@ ifndef NO_WEBFONTS EXTRA_REL_FILES += $(WEBFONT_DSO) endif -ifndef NO_EDITOR +ifdef MOZ_EDITOR OTHER_LIBS += -L$(NS_LIB) # diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 36dbb1df87d..09b79c6438f 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -30,7 +30,7 @@ MOZ_DEBUG = @MOZ_DEBUG@ MOZILLA_GPROF = @MOZILLA_GPROF@ BUILD_PROFILE = @MOZILLA_GPROF@ MOZ_DARK = @MOZ_DARK@ -NO_EDITOR = @NO_EDITOR@ +MOZ_EDITOR = @MOZ_EDITOR@ UNIX_SKIP_ASSERTS = @UNIX_SKIP_ASSERTS@ NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@ NO_SHARED_LIB = @NO_SHARED_LIB@ diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index b5a196604bd..28a2cfbb1cc 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -457,7 +457,6 @@ endif ifndef USE_AUTOCONF ifdef MOZ_LITE -NO_EDITOR = 1 NO_UNIX_LDAP = 1 MOZ_NAV_BUILD_PREFIX = 1 else @@ -465,12 +464,7 @@ DEFINES += -DMOZ_COMMUNICATOR_IIDS MOZ_COMMUNICATOR_IIDS = 1 MOZ_COMMUNICATOR_CONFIG_JS = 1 MOZ_COPY_ALL_JARS = 1 -ifndef NO_EDITOR -DEFINES += -DEDITOR MOZ_EDITOR = 1 -# This should go away as soon as MOZ_EDITOR is adopted everywhere. -EDITOR = 1 -endif endif endif # ! USE_AUTOCONF diff --git a/mozilla/configure.in b/mozilla/configure.in index 9b5cf40cda3..21b01aa1093 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -318,11 +318,10 @@ AC_ARG_ENABLE(mailnews, MOZ_DARK=1 fi] ) -NO_EDITOR=1 AC_ARG_ENABLE(editor, [ --enable-editor enable editor], [if test "$enableval" = "yes"; then - NO_EDITOR= + MOZ_EDITOR=1 fi] ) AC_ARG_ENABLE(asserts, @@ -388,7 +387,7 @@ AC_ARG_ENABLE(mail-compose, [ --enable-mail-compose enable old Messenger mail composer ], [if test "$enableval" = "yes"; then MOZ_MAIL_COMPOSE=1 - NO_EDITOR= + MOZ_EDITOR=1 fi]) NO_UNIX_LDAP=1 @@ -407,7 +406,7 @@ AC_SUBST(MOZ_OJI) AC_SUBST(MOZ_DEBUG) AC_SUBST(MOZILLA_GPROF) AC_SUBST(MOZ_DARK) -AC_SUBST(NO_EDITOR) +AC_SUBST(MOZ_EDITOR) AC_SUBST(UNIX_SKIP_ASSERTS) AC_SUBST(NO_UNIX_ASYNC_DNS) AC_SUBST(NO_SHARED_LIB)