add --eanble-mailnews and --enable-ldap switches, and depricate MOZ_DARK

This commit is contained in:
alecf%netscape.com 1998-12-23 00:48:52 +00:00
Родитель 9a5655f7f8
Коммит 05bdfc2d83
3 изменённых файлов: 40 добавлений и 9 удалений

Просмотреть файл

@ -29,7 +29,8 @@ MOZ_DEBUG = @MOZ_DEBUG@
MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
MOZILLA_GPROF = @MOZILLA_GPROF@
BUILD_PROFILE = @MOZILLA_GPROF@
MOZ_DARK = @MOZ_DARK@
MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@
MOZ_LDAP = @MOZ_LDAP@
MOZ_EDITOR = @MOZ_EDITOR@
UNIX_SKIP_ASSERTS = @UNIX_SKIP_ASSERTS@
NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@

Просмотреть файл

@ -188,6 +188,7 @@ UNZIP_PROG = $(LOCAL_BIN)/unzip
ZIP_PROG = $(LOCAL_BIN)/zip
ZIP_COMPR = 9
ZIP_FLAGS = -$(ZIP_COMPR)r
IDL_COMPILE = xpidl
ifeq ($(OS_ARCH),OS2)
EMPTY :=
@ -504,6 +505,10 @@ ifdef MOZ_MAIL_COMPOSE
DEFINES += -DMOZ_MAIL_COMPOSE
endif
ifdef MOZ_MAIL_NEWS
DEFINES += -DMOZ_MAIL_NEWS
endif
ifdef MOZ_DARK
DEFINES += -DMOZ_LDAP -DMOZ_MAIL_NEWS -DMOZ_NEO -DMOZ_OFFLINE -DMOZ_TASKBAR
MOZ_LDAP = 1

Просмотреть файл

@ -443,9 +443,15 @@ AC_ARG_ENABLE(profile,
AC_ARG_ENABLE(mailnews,
[ --enable-mailnews enable Mail & News (broken)],
[if test "$enableval" = "yes"; then
MOZ_DARK=1
MOZ_MAIL_NEWS=1
fi] )
AC_ARG_ENABLE(ldap,
[ --enable-ldap enable LDAP directory access],
[if test "$enableval" = "yes"; then
MOZ_LDAP=1
fi] )
AC_ARG_ENABLE(editor,
[ --enable-editor enable editor],
[if test "$enableval" = "yes"; then
@ -515,7 +521,8 @@ AC_SUBST(MOZ_OJI)
AC_SUBST(MOZ_DEBUG)
AC_SUBST(MOZ_DEBUG_MODULES)
AC_SUBST(MOZILLA_GPROF)
AC_SUBST(MOZ_DARK)
AC_SUBST(MOZ_MAIL_NEWS)
AC_SUBST(MOZ_LDAP)
AC_SUBST(MOZ_EDITOR)
AC_SUBST(UNIX_SKIP_ASSERTS)
AC_SUBST(NO_UNIX_ASYNC_DNS)
@ -1138,21 +1145,15 @@ network/module/tests/Makefile
network/protocol/Makefile
network/protocol/about/Makefile
network/protocol/callback/Makefile
network/protocol/certld/Makefile
network/protocol/dataurl/Makefile
network/protocol/file/Makefile
network/protocol/ftp/Makefile
network/protocol/gopher/Makefile
network/protocol/http/Makefile
network/protocol/imap4/Makefile
network/protocol/js/Makefile
network/protocol/ldap/Makefile
network/protocol/mailbox/Makefile
network/protocol/marimba/Makefile
network/protocol/nntp/Makefile
network/protocol/pop3/Makefile
network/protocol/remote/Makefile
network/protocol/smtp/Makefile
network/util/Makefile
rdf/Makefile
rdf/include/Makefile
@ -1209,12 +1210,36 @@ editor/txmgr/public/Makefile
editor/txmgr/src/Makefile
editor/txmgr/tests/Makefile"
MAILNEWS_MAKEFILES="
network/protocol/certld/Makefile
network/protocol/imap4/Makefile
network/protocol/mailbox/Makefile
network/protocol/nntp/Makefile
network/protocol/pop3/Makefile
network/protocol/smtp/Makefile
mailnews/Makefile
mailnews/base/Makefile
mailnews/base/public/Makefile
mailnews/base/src/Makefile
mailnews/base/build/Makefile
mailnews/base/tests/Makefile
mailnews/news/Makefile
mailnews/news/public/Makefile
mailnews/news/src/Makefile
mailnews/news/tests/Makefile
mailnews/public/Makefile
"
MAKEFILES="$NG_MAKEFILES"
if test -n "$MOZ_EDITOR"; then
MAKEFILES="$MAKEFILES $EDITOR_MAKEFILES"
fi
if test -n "$MOZ_MAIL_NEWS"; then
MAKEFILES="$MAKEFILES $MAILNEWS_MAKEFILES"
fi
AC_OUTPUT($MAKEFILES)