From fe67d866a064a28a9b7cecbf7006de7f6431e585 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <none@none>
Date: Sat, 8 Mar 2008 03:16:54 -0800
Subject: [PATCH] Bustage fix for bug 305782 (update
 toolkit/toolkit-makefiles.sh with SYSTEM_BZ2).

---
 toolkit/toolkit-makefiles.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 1136132a96f..5d542a29ce5 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -748,15 +748,11 @@ MAKEFILES_accessible="
   accessible/src/mac/Makefile
   accessible/build/Makefile
 "
+
 MAKEFILES_zlib="
   modules/zlib/standalone/Makefile
 "
 
-MAKEFILES_libbz2="
-  modules/libbz2/Makefile
-  modules/libbz2/src/Makefile
-"
-
 MAKEFILES_libmar="
   modules/libmar/Makefile
   modules/libmar/src/Makefile
@@ -805,7 +801,6 @@ add_makefiles "
   $MAKEFILES_libpr0n
   $MAKEFILES_accessible
   $MAKEFILES_zlib
-  $MAKEFILES_libbz2
   $MAKEFILES_libmar
 "
 
@@ -979,6 +974,13 @@ if [ ! "$SYSTEM_ZLIB" ]; then
   "
 fi
 
+if [ ! "$SYSTEM_BZ2" ]; then
+  add_makefiles "
+    modules/libbz2/Makefile
+    modules/libbz2/src/Makefile
+  "
+fi
+
 if test -n "$MOZ_UPDATE_PACKAGING"; then
   add_makefiles "
     tools/update-packaging/Makefile