Make -DHAVE_MOVEMAIL localized to mailnews.

Bug #58117 r=jag

config/autoconf.mk.in

@@ -338,9 +338,9 @@ OS_TEST=@OS_TEST@
 MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_EMX_OBJECTFORMAT = @MOZ_OS2_EMX_OBJECTFORMAT@
 
-HAVE_MOVEMAIL=@HAVE_MOVEMAIL@
 HAVE_XIE=@HAVE_XIE@
 
+MOZ_MOVEMAIL=@MOZ_MOVEMAIL@
 MOZ_PSM=@MOZ_PSM@
 
 # for Qt build

configure.in

@@ -4451,9 +4451,8 @@ elif test "$OS_TARGET" = "WINNT"; then
   AC_DEFINE(XP_PC)
 elif test "$OS_TARGET" = "BeOS"; then
   AC_DEFINE(XP_BEOS)
-  AC_DEFINE(HAVE_MOVEMAIL)
-  HAVE_MOVEMAIL=1
-  AC_SUBST(HAVE_MOVEMAIL)
+  MOZ_MOVEMAIL=1
+  AC_SUBST(MOZ_MOVEMAIL)
 elif test "$OS_TARGET" = "Mac OS"; then
   AC_DEFINE(XP_UNIX)
   AC_DEFINE(UNIX_EMBED)
@@ -4465,9 +4464,8 @@ elif test "$OS_TARGET" = "POSIX_for_OpenVMS_AXP"; then
 else
   AC_DEFINE(XP_UNIX)
   AC_DEFINE(UNIX_ASYNC_DNS)
-  AC_DEFINE(HAVE_MOVEMAIL)
-  HAVE_MOVEMAIL=1
-  AC_SUBST(HAVE_MOVEMAIL)
+  MOZ_MOVEMAIL=1
+  AC_SUBST(MOZ_MOVEMAIL)
 fi
 
 AC_DEFINE(JS_THREADSAFE)

mailnews/base/src/Makefile.in

@@ -133,3 +133,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_MOVEMAIL
+DEFINES	+= -DHAVE_MOVEMAIL
+endif
+

mailnews/local/build/Makefile.in

@@ -72,3 +72,7 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_MOVEMAIL
+DEFINES	+= -DHAVE_MOVEMAIL
+endif
+

mailnews/local/public/Makefile.in

@@ -42,7 +42,7 @@ XPIDLSRCS	= \
 		nsILocalMailIncomingServer.idl \
 		$(NULL)
 
-ifdef HAVE_MOVEMAIL
+ifdef MOZ_MOVEMAIL
 XPIDLSRCS	+= \
 		nsIMovemailService.idl \
 		nsIMovemailIncomingServer.idl
@@ -50,3 +50,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_MOVEMAIL
+DEFINES	+= -DHAVE_MOVEMAIL
+endif

mailnews/local/src/Makefile.in

@@ -83,13 +83,11 @@ EXPORTS		= \
 		nsNoIncomingServer.h \
 		$(NULL)
 
-ifdef HAVE_MOVEMAIL
+ifdef MOZ_MOVEMAIL
 CPPSRCS		+= \
 		nsMovemailService.cpp \
 		nsMovemailIncomingServer.cpp
-endif
 
-ifdef HAVE_MOVEMAIL
 EXPORTS		+= \
 		nsMovemailService.h \
 		nsMovemailIncomingServer.h
@@ -100,3 +98,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_MOVEMAIL
+DEFINES	+= -DHAVE_MOVEMAIL
+endif