зеркало из https://github.com/mozilla/gecko-dev.git
Moved zlib from REQUIRES to a ifndef MOZ_NATIVE_ZLIB endif block.
This commit is contained in:
Родитель
6750f658a4
Коммит
5db72cde51
|
@ -46,7 +46,7 @@ CPPSRCS = \
|
||||||
nsCCodeSourcePrincipal.cpp \
|
nsCCodeSourcePrincipal.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
REQUIRES = xpcom security layer js jar zlib pref img util rdf caps
|
REQUIRES = xpcom security layer js jar pref img util rdf caps
|
||||||
|
|
||||||
ifndef MOZ_NATIVE_ZLIB
|
ifndef MOZ_NATIVE_ZLIB
|
||||||
REQUIRES += zlib
|
REQUIRES += zlib
|
||||||
|
|
|
@ -83,7 +83,7 @@ CPPSRCS = color.cpp \
|
||||||
|
|
||||||
EXPORTS = PIMGCB.h PPSIMGCB.h
|
EXPORTS = PIMGCB.h PPSIMGCB.h
|
||||||
|
|
||||||
REQUIRES = jtools java nspr dbm util img layer js xpcom
|
REQUIRES = jtools java dbm util img layer js xpcom
|
||||||
|
|
||||||
ifdef NU_CACHE
|
ifdef NU_CACHE
|
||||||
REQUIRES += cache
|
REQUIRES += cache
|
||||||
|
|
|
@ -30,7 +30,11 @@ MODULE = softupdate
|
||||||
LIBRARY_NAME = softupdate
|
LIBRARY_NAME = softupdate
|
||||||
|
|
||||||
REQUIRES = softupdt js java net dbm img util layer pref \
|
REQUIRES = softupdt js java net dbm img util layer pref \
|
||||||
jar security lay style libreg network progress base xpcom caps zlib plugin oji ojiimpl
|
jar security lay style libreg network progress base xpcom caps plugin oji ojiimpl
|
||||||
|
|
||||||
|
ifndef MOZ_NATIVE_ZLIB
|
||||||
|
REQUIRES += zlib
|
||||||
|
endif
|
||||||
|
|
||||||
INCLUDES += -I$(topsrcdir)/base/src
|
INCLUDES += -I$(topsrcdir)/base/src
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,11 @@ srcdir = @srcdir@
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
REQUIRES = softupdt zlib
|
REQUIRES = softupdt
|
||||||
|
|
||||||
|
ifndef MOZ_NATIVE_ZLIB
|
||||||
|
REQUIRES += zlib
|
||||||
|
endif
|
||||||
|
|
||||||
CSRCS = nsdiff.c crc32.c
|
CSRCS = nsdiff.c crc32.c
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,10 @@ endif
|
||||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||||
|
|
||||||
REQUIRES = network img lay layer util parse pref js \
|
REQUIRES = network img lay layer util parse pref js \
|
||||||
security marimurl style zlib softupdt mimetype ldap
|
security marimurl style softupdt mimetype ldap
|
||||||
|
|
||||||
|
ifndef MOZ_NATIVE_ZLIB
|
||||||
|
REQUIRES += zlib
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
Загрузка…
Ссылка в новой задаче