From d435508ffb48c2a2a62996626f1c4b64f8b1d0ce Mon Sep 17 00:00:00 2001
From: "ducarroz%netscape.com" <ducarroz%netscape.com>
Date: Thu, 6 May 1999 00:10:47 +0000
Subject: [PATCH] Mailnews is now fully integrated to the build process. I have
 remove the previous patch to avoid to build mailnews by befault.

---
 build/mac/BuildNGLayout.pl          | 2 +-
 build/mac/PullBuildNGLayout.pl      | 1 +
 build/mac/PullBuildNGLayoutDebug.pl | 6 +-----
 build/mac/TinderboxNGLayout.pl      | 6 +-----
 build/mac/TinderboxNGLayoutOpt.pl   | 6 +-----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/build/mac/BuildNGLayout.pl b/build/mac/BuildNGLayout.pl
index 738ddbabd52..02ca12614a2 100644
--- a/build/mac/BuildNGLayout.pl
+++ b/build/mac/BuildNGLayout.pl
@@ -47,9 +47,9 @@ $build{intl} = 0;
 $build{nglayout} = 0;
 $build{resources} = 0;
 $build{editor} = 0;
+$build{mailnews} = 0;
 $build{viewer} = 0;
 $build{xpapp} = 0;
-$build{mailnews} = 1;
 
 if ($pull{all})
 {
diff --git a/build/mac/PullBuildNGLayout.pl b/build/mac/PullBuildNGLayout.pl
index 4b86a1bcd26..812451ed80c 100644
--- a/build/mac/PullBuildNGLayout.pl
+++ b/build/mac/PullBuildNGLayout.pl
@@ -46,6 +46,7 @@ $build{common} = 0;
 $build{nglayout} = 0;
 $build{resources} = 0;
 $build{editor} = 0;
+$build{mailnews} = 0;
 $build{viewer} = 0;
 $build{xpapp} = 0;
 
diff --git a/build/mac/PullBuildNGLayoutDebug.pl b/build/mac/PullBuildNGLayoutDebug.pl
index cc3cd32f24c..bb0c9cd4b7e 100644
--- a/build/mac/PullBuildNGLayoutDebug.pl
+++ b/build/mac/PullBuildNGLayoutDebug.pl
@@ -47,9 +47,9 @@ $build{common} = 0;
 $build{nglayout} = 0;
 $build{resources} = 0;
 $build{editor} = 0;
+$build{mailnews} = 0;
 $build{viewer} = 0;
 $build{xpapp} = 0;
-$build{mailnews} = 0;
 
 if ($pull{all})
 {
@@ -60,14 +60,10 @@ if ($pull{all})
 }
 if ($build{all})
 {
-	$temp = $build{mailnews};
-
 	foreach $k (keys(%build))
 	{
 		$build{$k} = 1;
 	}
-	
-	$build{mailnews} = $temp;	# don't turn on mailnews until we are sure that everything is ok on Tinderbox
 }
 
 # do the work
diff --git a/build/mac/TinderboxNGLayout.pl b/build/mac/TinderboxNGLayout.pl
index f601af0fd18..27b41110975 100644
--- a/build/mac/TinderboxNGLayout.pl
+++ b/build/mac/TinderboxNGLayout.pl
@@ -47,9 +47,9 @@ $build{common} = 0;
 $build{nglayout} = 0;
 $build{resources} = 0;
 $build{editor} = 0;
+$build{mailnews} = 0;
 $build{viewer} = 0;
 $build{xpapp} = 0;
-$build{mailnews} = 0;
 
 
 # script
@@ -66,14 +66,10 @@ if ($pull{all})
 }
 if ($build{all})
 {
-	$temp = $build{mailnews};
-
 	foreach $k (keys(%build))
 	{
 		$build{$k} = 1;
 	}
-	
-	$build{mailnews} = $temp;	# don't turn on mailnews until we are sure that everything is ok on Tinderbox
 }
 
 # do the work
diff --git a/build/mac/TinderboxNGLayoutOpt.pl b/build/mac/TinderboxNGLayoutOpt.pl
index aaf5c875bbe..a5938f46363 100644
--- a/build/mac/TinderboxNGLayoutOpt.pl
+++ b/build/mac/TinderboxNGLayoutOpt.pl
@@ -47,9 +47,9 @@ $build{common} = 0;
 $build{nglayout} = 0;
 $build{resources} = 0;
 $build{editor} = 0;
+$build{mailnews} = 0;
 $build{viewer} = 0;
 $build{xpapp} = 0;
-$build{mailnews} = 1;
 
 
 # script
@@ -64,14 +64,10 @@ if ($pull{all})
 }
 if ($build{all})
 {
-	$temp = $build{mailnews};
-
 	foreach $k (keys(%build))
 	{
 		$build{$k} = 1;
 	}
-	
-	$build{mailnews} = $temp;	# don't turn on mailnews until we are sure that everything is ok on Tinderbox
 }
 
 # do the work