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

This commit is contained in:
Mike Hommey 2012-07-25 07:44:08 +02:00
parent 43737d8fa9
commit 88a8f89f8d
2 changed files with 2 additions and 1 deletions

View File

@ -43,7 +43,7 @@ include $(topsrcdir)/config/config.mk
NO_INSTALL=1 NO_INSTALL=1
# Force wrap zlib system header if building js as a shared library. # 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 DEFINES += -DMOZ_NATIVE_ZLIB=1
endif endif

View File

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