From 28473a58a2f471355dae7aae8b4d545cbb6b09f1 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 3 Nov 2019 21:21:22 -0500
Subject: [PATCH] Issue #1258 - Part 6: Add MOZ_MOVEMAIL to MOZ_MAILNEWS
 configure logic

---
 old-configure.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/old-configure.in b/old-configure.in
index eaed06054d..a335ca9a3c 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2837,15 +2837,22 @@ MOZ_ARG_ENABLE_BOOL(mailnews,
 if test -n "$MOZ_MAILNEWS"; then
     MOZ_MORK=1
     MOZ_LDAP_XPCOM=1
-    if test "$_WIN32_MSVC"; then
+
+    if test "$OS_ARCH" == "WINNT"; then
         MOZ_MAPI_SUPPORT=1
+    else
+      MOZ_MOVEMAIL=1
+      HAVE_MOVEMAIL=1
+      AC_DEFINE(HAVE_MOVEMAIL)
     fi
+
     AC_DEFINE(MOZ_MAILNEWS)
     AC_DEFINE(MOZ_MORK)
 fi
 
 AC_SUBST(MOZ_MAILNEWS)
 AC_SUBST(MOZ_MORK)
+AC_SUBST(MOZ_MOVEMAIL)
 
 dnl =========================================================
 dnl = LDAP