Include libpng/zlib headers as system headers when using system libpng/zlib. b=359000/359001 r=bsmedberg

config/Makefile.in

@@ -113,7 +113,12 @@ endif
 ifdef WRAP_SYSTEM_INCLUDES
 export::
 	if test ! -d system_wrappers; then mkdir system_wrappers; fi
-	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+		-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
+		-DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
+		-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
+		-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
+		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)/include
 endif
 

config/system-headers

@@ -973,3 +973,9 @@ plstr.h
 plarenas.h
 plarena.h
 plhash.h
+#if MOZ_NATIVE_PNG==1
+png.h
+#endif
+#if MOZ_NATIVE_ZLIB==1
+zlib.h
+#endif