Bug 776305 - Fix building spidermonkey with system zlib after bug 761723. r=khuey

js/src/config/Makefile.in

@@ -43,7 +43,7 @@ include $(topsrcdir)/config/config.mk
 NO_INSTALL=1
 
 # Force wrap zlib system header if building js as a shared library.
-ifdef JS_SHARED_LIBRARY
+ifneq (,$(JS_SHARED_LIBRARY)$(MOZ_NATIVE_ZLIB))
 DEFINES += -DMOZ_NATIVE_ZLIB=1
 endif
 

js/src/config/autoconf.mk.in

@@ -194,6 +194,7 @@ NSPR_CONFIG	= @NSPR_CONFIG@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
 
+MOZ_NATIVE_ZLIB = @MOZ_NATIVE_ZLIB@
 MOZ_ZLIB_LIBS   = @MOZ_ZLIB_LIBS@
 MOZ_ZLIB_CFLAGS = @MOZ_ZLIB_CFLAGS@