From 123faba661433b0ce98c4e66b10593a7f4927010 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 30 Jul 2012 19:23:44 -0700 Subject: [PATCH] Bug 778560 - Fix typo that prevented JS from ever using zlib. r=dmandelin --- js/src/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 6ba1750f8069..77135ffce53c 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -668,7 +668,10 @@ endif CFLAGS += $(MOZ_ZLIB_CFLAGS) EXTRA_LIBS += $(MOZ_ZLIB_LIBS) -ifdef MOZ_LIB_LIBS +# Enable zlib usage if zlib has been located. When building the browser on +# Windows, MOZ_ZLIB_LIBS is empty because zlib is part of libmozglue. We thus +# also enable zlib if mozglue is present. +ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS)) DEFINES += -DUSE_ZLIB endif