Add additional cairo headers to system-headers, except when using in-tree cairo and have --enable-libxul. b=358934 r=bsmedberg

config/Makefile.in

@@ -113,7 +113,7 @@ endif
 ifdef WRAP_SYSTEM_INCLUDES
 export::
 	if test ! -d system_wrappers; then mkdir system_wrappers; fi
-	$(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers < $(srcdir)/system-headers
+	$(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
 	$(INSTALL) system_wrappers $(DIST)/include
 endif
 

config/system-headers

@@ -65,7 +65,27 @@ bstring.h
 builtin.h
 Button.h
 byteswap.h
+#if MOZ_ENABLE_LIBXUL!=1
+#define WRAP_CAIRO_HEADERS
+#endif
+#if MOZ_TREE_CAIRO!=1
+#define WRAP_CAIRO_HEADERS
+#endif
+#ifdef WRAP_CAIRO_HEADERS
 cairo.h
+cairo-atsui.h
+cairo-beos.h
+cairo-ft.h
+cairo-glitz.h
+cairo-nquartz.h
+cairo-os2.h
+cairo-pdf.h
+cairo-ps.h
+cairo-quartz.h
+cairo-win32.h
+cairo-xlib.h
+cairo-xlib-xrender.h
+#endif
 callconv.h
 Carbon/Carbon.h
 CarbonEvents.h