Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11507 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
1998-09-30 00:48:23 +00:00
parent 0fe4cfe496
commit e6d0bdcfb8
6 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/cmd/stubfe/Makefile
View File

@@ -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
#

6
mozilla/cmd/stubfe/Makefile.in
View File

@@ -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
#

4
mozilla/cmd/xfe/Makefile.in
View File

@@ -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)
#

2
mozilla/config/autoconf.mk.in
View File

@@ -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@

6
mozilla/config/config.mk
View File

@@ -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

7
mozilla/configure.in
View File

@@ -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)