From d64bd4491f67179a32da8fecb41b56d14c838c07 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <none@none>
Date: Sat, 8 Mar 2008 04:33:28 -0800
Subject: [PATCH] Back out Mike Hommey's patch from bug 305782 due to build
 bustage.

---
 config/Makefile.in                            |  1 -
 config/autoconf.mk.in                         | 11 ------
 config/system-headers                         |  3 --
 configure.in                                  | 36 -------------------
 extensions/metrics/build/Makefile.in          |  4 +--
 extensions/metrics/src/Makefile.in            |  2 +-
 extensions/metrics/test/Makefile.in           |  4 +--
 other-licenses/bsdiff/Makefile.in             |  4 +--
 .../mozapps/update/src/updater/Makefile.in    |  6 ++--
 .../mozapps/update/src/updater/updater.cpp    |  4 ---
 toolkit/toolkit-makefiles.sh                  | 14 ++++----
 toolkit/toolkit-tiers.mk                      |  2 --
 12 files changed, 13 insertions(+), 78 deletions(-)

diff --git a/config/Makefile.in b/config/Makefile.in
index cf80cc10be3..8330678dc78 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -122,7 +122,6 @@ export::
 		-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
 		-DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
 		-DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
-		-DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
 		-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
 		-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
 		-DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 1ecdee60049..13b63cff53c 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -212,7 +212,6 @@ MOZ_HUNSPELL_LIBS = @MOZ_HUNSPELL_LIBS@
 MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLAGS@
 
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
-MOZ_NATIVE_BZ2	= @SYSTEM_BZ2@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@
 MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
@@ -410,16 +409,6 @@ endif
 ZLIB_REQUIRES	= zlib
 endif
 
-ifdef MOZ_NATIVE_BZ2
-BZ2_CFLAGS	= @BZ2_CFLAGS@
-BZ2_LIBS	= @BZ2_LIBS@
-BZ2_REQUIRES	=
-else
-BZ2_CFLAGS	= @MOZ_BZ2_CFLAGS@
-BZ2_LIBS	= @MOZ_BZ2_LIBS@
-BZ2_REQUIRES	= libbz2
-endif
-
 ifdef MOZ_NATIVE_PNG
 PNG_CFLAGS	= @PNG_CFLAGS@
 PNG_LIBS	= @PNG_LIBS@
diff --git a/config/system-headers b/config/system-headers
index dfd406182c6..e2439dfa864 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -971,6 +971,3 @@ libsn/sn-util.h
 #if MOZ_NATIVE_HUNSPELL==1
 hunspell.hxx
 #endif
-#if MOZ_NATIVE_BZ2==1
-bzlib.h
-#endif
diff --git a/configure.in b/configure.in
index 6a5ee95f742..7483a2319d8 100644
--- a/configure.in
+++ b/configure.in
@@ -921,8 +921,6 @@ MOZ_JPEG_CFLAGS=
 MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/jpeg)'
 MOZ_ZLIB_CFLAGS=
 MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src)'
-MOZ_BZ2_CFLAGS=
-MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
 MOZ_PNG_CFLAGS=
 MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
 
@@ -4062,35 +4060,6 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
     ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
 fi
 
-dnl system BZIP2 Support
-dnl ========================================================
-MOZ_ARG_WITH_STRING(system-bz2,
-[  --with-system-bz2[=PFX]
-                          Use system libbz2 [installed at prefix PFX]],
-    BZ2_DIR=$withval)
-
-_SAVE_CFLAGS=$CFLAGS
-_SAVE_LDFLAGS=$LDFLAGS
-_SAVE_LIBS=$LIBS
-if test -n "${BZ2_DIR}" -a "${BZ2_DIR}" != "yes"; then
-    CFLAGS="-I${BZ2_DIR}/include $CFLAGS"
-    LDFLAGS="-L${BZ2_DIR}/lib $LDFLAGS"
-fi
-if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then
-    SYSTEM_BZ2=
-else
-    AC_CHECK_LIB(bz2, BZ2_bzread, [SYSTEM_BZ2=1 BZ2_LIBS="-lbz2"],
-	[SYSTEM_BZ2= BZ2_CFLAGS= BZ2_LIBS=], $BZ2_LIBS)
-fi
-CFLAGS=$_SAVE_CFLAGS
-LDFLAGS=$_SAVE_LDFLAGS
-LIBS=$_SAVE_LIBS
-
-if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$SYSTEM_BZ2" = 1; then
-    BZ2_CFLAGS="-I${BZ2_DIR}/include"
-    BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}"
-fi
-
 dnl system PNG Support
 dnl ========================================================
 MOZ_ARG_WITH_STRING(system-png, 
@@ -7715,14 +7684,11 @@ AC_SUBST(SYSTEM_MAKEDEPEND)
 AC_SUBST(SYSTEM_JPEG)
 AC_SUBST(SYSTEM_PNG)
 AC_SUBST(SYSTEM_ZLIB)
-AC_SUBST(SYSTEM_BZ2)
 
 AC_SUBST(JPEG_CFLAGS)
 AC_SUBST(JPEG_LIBS)
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
-AC_SUBST(BZ2_CFLAGS)
-AC_SUBST(BZ2_LIBS)
 AC_SUBST(PNG_CFLAGS)
 AC_SUBST(PNG_LIBS)
 
@@ -7730,8 +7696,6 @@ AC_SUBST(MOZ_JPEG_CFLAGS)
 AC_SUBST(MOZ_JPEG_LIBS)
 AC_SUBST(MOZ_ZLIB_CFLAGS)
 AC_SUBST(MOZ_ZLIB_LIBS)
-AC_SUBST(MOZ_BZ2_CFLAGS)
-AC_SUBST(MOZ_BZ2_LIBS)
 AC_SUBST(MOZ_PNG_CFLAGS)
 AC_SUBST(MOZ_PNG_LIBS)
 
diff --git a/extensions/metrics/build/Makefile.in b/extensions/metrics/build/Makefile.in
index 17596421049..fb97539fa6c 100644
--- a/extensions/metrics/build/Makefile.in
+++ b/extensions/metrics/build/Makefile.in
@@ -61,11 +61,11 @@ CPPSRCS		= \
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
+		$(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \
 		   $(NSPR_LIBS) \
-		   $(BZ2_LIBS) \
 		   $(NULL)
 
 LOCAL_INCLUDES	= \
@@ -80,4 +80,4 @@ ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
   LDFLAGS += -NODEFAULTLIB:MSVCRT
 endif
 
-CXXFLAGS += $(BZ2_CFLAGS)
+
diff --git a/extensions/metrics/src/Makefile.in b/extensions/metrics/src/Makefile.in
index 3d7f59edaa8..6648c55c22b 100644
--- a/extensions/metrics/src/Makefile.in
+++ b/extensions/metrics/src/Makefile.in
@@ -57,7 +57,7 @@ REQUIRES	= xpcom \
 		  docshell \
 		  layout \
 		  widget \
-		  $(BZ2_REQUIRES) \
+		  libbz2 \
 		  xulapp \
 		  extensions \
 		  rdf \
diff --git a/extensions/metrics/test/Makefile.in b/extensions/metrics/test/Makefile.in
index 308db03daa6..71865ab7d1e 100644
--- a/extensions/metrics/test/Makefile.in
+++ b/extensions/metrics/test/Makefile.in
@@ -67,7 +67,7 @@ LOCAL_INCLUDES	= \
 
 LIBS		= \
 		../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
-		$(BZ2_LIBS) \
+		$(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
@@ -76,8 +76,6 @@ XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
 
-CXXFLAGS += $(BZ2_CFLAGS)
-
 # Give the unit tests absolute paths to the data and temp directories.
 # For cygwin, we need to convert the paths to native Windows paths.
 ifdef CYGWIN_WRAPPER
diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
index 6e64a51fa0f..622027e6a22 100644
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -47,7 +47,7 @@ include $(DEPTH)/config/autoconf.mk
 # build system and is not intended to be included in Mozilla distributions.
 HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
 HOST_CSRCS = bsdiff.c
-HOST_LIBS += $(BZ2_LIBS)
+HOST_LIBS += $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX)
 
 ifeq (WINNT,$(OS_ARCH))
 HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
@@ -56,5 +56,3 @@ endif
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/src/updater
 
 include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS += $(BZ2_CFLAGS)
diff --git a/toolkit/mozapps/update/src/updater/Makefile.in b/toolkit/mozapps/update/src/updater/Makefile.in
index b5f06064c13..d020d6f4fe4 100644
--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@@ -54,12 +54,12 @@ PROGRAM = updater$(BIN_SUFFIX)
 
 REQUIRES	= \
 		libmar \
-		$(BZ2_REQUIRES) \
+		libbz2 \
 		$(NULL)
 
 LIBS += \
 	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
-	$(BZ2_LIBS) \
+	$(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
@@ -130,5 +130,3 @@ ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 REQUIRES += string
 endif
-
-CXXFLAGS += $(BZ2_CFLAGS)
diff --git a/toolkit/mozapps/update/src/updater/updater.cpp b/toolkit/mozapps/update/src/updater/updater.cpp
index b04446435ee..52027c9d0cc 100644
--- a/toolkit/mozapps/update/src/updater/updater.cpp
+++ b/toolkit/mozapps/update/src/updater/updater.cpp
@@ -138,11 +138,7 @@ void LaunchChild(int argc, char **argv);
 
 // This variable lives in libbz2.  It's declared in bzlib_private.h, so we just
 // declare it here to avoid including that entire header file.
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-extern "C"  __attribute__((visibility("default"))) unsigned int BZ2_crc32Table[256];
-#else
 extern "C" unsigned int BZ2_crc32Table[256];
-#endif
 
 static unsigned int
 crc32(const unsigned char *buf, unsigned int len)
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 5d542a29ce5..1136132a96f 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -748,11 +748,15 @@ 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
@@ -801,6 +805,7 @@ add_makefiles "
   $MAKEFILES_libpr0n
   $MAKEFILES_accessible
   $MAKEFILES_zlib
+  $MAKEFILES_libbz2
   $MAKEFILES_libmar
 "
 
@@ -974,13 +979,6 @@ 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
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 48832585d23..5f3a98db8cb 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -64,9 +64,7 @@ tier_external_dirs	+= modules/zlib/standalone
 endif
 
 ifdef MOZ_UPDATER
-ifndef MOZ_NATIVE_BZ2
 tier_external_dirs += modules/libbz2
-endif
 tier_external_dirs += modules/libmar
 endif