Bug 888660 - MOZ_MOVEMAIL ifdef not working for account central page. r=jcranmer, r=Standard8, a=Standard8
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -14,16 +14,18 @@ dnl Optional parts of the build.
AC_SUBST(MOZ_MORK)
if test "$MOZ_MORK"; then
AC_DEFINE(MOZ_MORK)
MORK_COMPONENT=mork
MORK_MODULE="MODULE(nsMorkModule)"
fi
if test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then
MOZ_MOVEMAIL=1
+ HAVE_MOVEMAIL=1
+ AC_DEFINE(HAVE_MOVEMAIL)
fi
AC_SUBST(MOZ_MOVEMAIL)
dnl Get other versions (for the calendar plugin)
if test "$COMM_BUILD" = "1"; then
commdir=$topsrcdir
else
commdir=$topsrcdir/..
--- a/mailnews/base/content/msgAccountCentral.xul
+++ b/mailnews/base/content/msgAccountCentral.xul
@@ -185,17 +185,17 @@
value="&newsSectionHdr.label;"
chromedir="&locale.dir;"
onclick="CreateNewAccountTB('newsgroups');"/>
<label id="CreateAccountRSS"
class="acctCentralNewAcctText acctCentralLinkText"
value="&feedsSectionHdr.label;"
chromedir="&locale.dir;"
onclick="CreateNewAccountTB('feeds');"/>
-#ifdef MOZ_MOVEMAIL
+#ifdef HAVE_MOVEMAIL
<label id="CreateAccountMovemail"
class="acctCentralNewAcctText acctCentralLinkText"
value="&movemail.label;"
chromedir="&locale.dir;"
onclick="CreateNewAccountTB('movemail');"/>
#endif
</vbox>
</row>
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -18,13 +18,8 @@ endif
ifdef MOZ_LDAP_XPCOM
DEFINES += -DMOZ_LDAP_XPCOM
endif
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_MOVEMAIL
-DEFINES += -DHAVE_MOVEMAIL
-endif
-
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -104,12 +104,8 @@ LOCAL_INCLUDES = -I$(srcdir) \
-I$(srcdir)/../extensions/mdn/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,shell32)
endif
-
-ifdef MOZ_MOVEMAIL
-DEFINES += -DHAVE_MOVEMAIL
-endif
--- a/mailnews/local/public/Makefile.in
+++ b/mailnews/local/public/Makefile.in
@@ -6,12 +6,8 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_MOVEMAIL
-DEFINES += -DHAVE_MOVEMAIL
-endif
--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@@ -15,12 +15,8 @@ ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_MOVEMAIL
-DEFINES += -DHAVE_MOVEMAIL
-endif
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -14,16 +14,18 @@ dnl Optional parts of the build.
AC_SUBST(MOZ_MORK)
if test "$MOZ_MORK"; then
AC_DEFINE(MOZ_MORK)
MORK_COMPONENT=mork
MORK_MODULE="MODULE(nsMorkModule)"
fi
if test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then
MOZ_MOVEMAIL=1
+ HAVE_MOVEMAIL=1
+ AC_DEFINE(HAVE_MOVEMAIL)
fi
AC_SUBST(MOZ_MOVEMAIL)
dnl Get other versions (for the calendar plugin)
if test "$COMM_BUILD" = "1"; then
commdir=$topsrcdir
else
commdir=$topsrcdir/..