Update REQUIRES so that we do not accidentally build using the system headers of jpeg,zlib,png,mng when we are supposed to be building using the Mozilla copies of these libraries.

Bug #97386 r=mcafee a=dbaron

extensions/inspector/base/src/Makefile.in

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE=inspector
 LIBRARY_NAME=inspector_s
-REQUIRES=xpcom string dom rdf rdfutil layout widget locale gfx2 necko docshell view timer imglib2 mimetype exthandler
+REQUIRES=xpcom string dom rdf rdfutil layout widget locale gfx2 necko docshell view timer imglib2 mimetype exthandler $(PNG_REQUIRES) $(ZLIB_REQUIRES)
 
 CPPSRCS= \
 	inDOMDataSource.cpp \

modules/libimg/mng/Makefile.in

@@ -30,7 +30,7 @@ MODULE		= mng
 LIBRARY_NAME	= mozmng
 EXPORT_LIBRARY = 1
 
-REQUIRES	= 
+REQUIRES	= $(JPEG_REQUIRES) $(ZLIB_REQUIRES)
 
 CSRCS		= \
 		libmng_callback_xs.c \

modules/libimg/png/Makefile.in

@@ -30,6 +30,7 @@ MODULE		= png
 LIBRARY_NAME	= mozpng
 EXPORT_LIBRARY = 1
 
+REQUIRES	= $(ZLIB_REQUIRES)
 
 CSRCS		= \
 		png.c \

modules/libjar/Makefile.in

@@ -44,7 +44,7 @@ LIBRARY_NAME	= jar$(VERSION_NUMBER)
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsJarModule
-REQUIRES	= xpcom string caps
+REQUIRES	= xpcom string caps $(ZLIB_REQUIRES)
 
 CPPSRCS		= $(MODULES_LIBJAR_LCPPSRCS)
 

modules/libpr0n/decoders/jpeg/Makefile.in

@@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsJPEGDecoderModule
 
-REQUIRES	= xpcom string necko layout gfx2 imglib2
+REQUIRES	= xpcom string necko layout gfx2 imglib2 $(JPEG_REQUIRES)
 
 CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
 

modules/libpr0n/decoders/mng/Makefile.in

@@ -29,6 +29,8 @@ LIBRARY_NAME	= imgmng
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMNGDecoderModule
 
+REQUIRES	= $(MNG_REQUIRES) $(JPEG_REQUIRES) $(ZLIB_REQUIRES)
+
 CPPSRCS		= nsMNGDecoder.cpp nsMNGFactory.cpp imgContainerMNG.cpp
 
 EXTRA_DSO_LDOPTS = $(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \

modules/libpr0n/decoders/png/Makefile.in

@@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPNGDecoderModule
 
-REQUIRES	= xpcom necko layout png gfx2 imglib2
+REQUIRES	= xpcom necko layout gfx2 imglib2 $(PNG_REQUIRES) $(ZLIB_REQUIRES)
 
 CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
 

netwerk/build/Makefile.in

@@ -31,7 +31,7 @@ LIBRARY_NAME	= necko
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= necko_core_and_primary_protocols
-REQUIRES	= xpcom string nkcache pref mimetype util jar locale intl
+REQUIRES	= xpcom string nkcache pref mimetype util jar locale intl $(ZLIB_REQUIRES)
 
 CPPSRCS		= nsNetModule.cpp
 EXPORTS		= nsNetCID.h

netwerk/streamconv/converters/Makefile.in

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkcnvts_s
-REQUIRES	= xpcom string mimetype locale util pref exthandler
+REQUIRES	= xpcom string mimetype locale util pref exthandler $(ZLIB_REQUIRES)
 
 EXPORTS =                 \
         nsHTTPChunkConv.h \

xpinstall/src/Makefile.in

@@ -35,7 +35,7 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= xpinstal
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSoftwareUpdate
-REQUIRES	= xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom mozcomps windowwatcher
+REQUIRES	= xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom mozcomps windowwatcher $(ZLIB_REQUIRES)
 
 # XXX shouldn't need to export this
 EXPORTS		= nsXPITriggerInfo.h