From bd2878fda4be6d6c30cacb6c6c3fe315cdfce689 Mon Sep 17 00:00:00 2001
From: "wtc%google.com" <wtc%google.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 4 Feb 2010 18:59:11 +0000
Subject: [PATCH] Bug 544191: Use system zlib on Mac OS X.  When using system
 zlib, -lz has to be added to OS_LIBS instead of EXTRA_LIBS because $(PROGRAM)
 depends on $(EXTRA_LIBS).  r=rrelyea. Modified Files: 	coreconf/Darwin.mk
 nss/cmd/platlibs.mk 	nss/cmd/modutil/Makefile nss/cmd/signtool/Makefile

git-svn-id: svn://10.0.0.236/trunk@259601 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/coreconf/Darwin.mk        | 3 ++-
 mozilla/security/nss/cmd/modutil/Makefile  | 6 ++++++
 mozilla/security/nss/cmd/platlibs.mk       | 4 +---
 mozilla/security/nss/cmd/signtool/Makefile | 6 ++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mozilla/security/coreconf/Darwin.mk b/mozilla/security/coreconf/Darwin.mk
index a78894e42bf..c9d67a7dca5 100644
--- a/mozilla/security/coreconf/Darwin.mk
+++ b/mozilla/security/coreconf/Darwin.mk
@@ -131,4 +131,5 @@ DLL_SUFFIX	= dylib
 PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
                 sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
 
-G++INCLUDES	= -I/usr/include/g++
+USE_SYSTEM_ZLIB = 1
+ZLIB_LIBS	= -lz
diff --git a/mozilla/security/nss/cmd/modutil/Makefile b/mozilla/security/nss/cmd/modutil/Makefile
index 8bdb8658d64..a0c1ba50f43 100644
--- a/mozilla/security/nss/cmd/modutil/Makefile
+++ b/mozilla/security/nss/cmd/modutil/Makefile
@@ -57,6 +57,12 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 include ../platlibs.mk
 
+ifdef USE_SYSTEM_ZLIB
+OS_LIBS += $(ZLIB_LIBS)
+else
+EXTRA_LIBS += $(ZLIB_LIBS)
+endif
+
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/mozilla/security/nss/cmd/platlibs.mk b/mozilla/security/nss/cmd/platlibs.mk
index d02f66f292b..65969fcb7ed 100644
--- a/mozilla/security/nss/cmd/platlibs.mk
+++ b/mozilla/security/nss/cmd/platlibs.mk
@@ -250,6 +250,4 @@ ifndef USE_SYSTEM_ZLIB
 ZLIB_LIBS = $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX)
 endif
 
-JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
-	$(ZLIB_LIBS) \
-	$(NULL)
+JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX)
diff --git a/mozilla/security/nss/cmd/signtool/Makefile b/mozilla/security/nss/cmd/signtool/Makefile
index cd06aaa4fd8..ed6c9fe2472 100644
--- a/mozilla/security/nss/cmd/signtool/Makefile
+++ b/mozilla/security/nss/cmd/signtool/Makefile
@@ -58,6 +58,12 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 include ../platlibs.mk
 
+ifdef USE_SYSTEM_ZLIB
+OS_LIBS += $(ZLIB_LIBS)
+else
+EXTRA_LIBS += $(ZLIB_LIBS)
+endif
+
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################