tweak for internal cairo

vcl/Library_vclplug_gen.mk

@@ -65,11 +65,21 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
 ))
 
 ifeq ($(SYSTEM_CAIRO),YES)
+$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+    $$(CXXFLAGS) \
+    $$(CAIRO_CFLAGS) \
+    -DSYSTEM_CAIRO \
+))
 $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
     $$(LDFLAGS) \
     $$(CAIRO_LIBS) \
 ))
 else
+$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+    $$(CXXFLAGS) \
+    $$(FONTCONFIG_CFLAGS) \
+    $$(FREETYPE_CFLAGS) \
+))
 $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
     cairo \
 ))
@@ -130,12 +140,6 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
     -DVCLPLUG_GEN_IMPLEMENTATION \
 ))
 
-## unconditional cairo
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
-    $$(CXXFLAGS) \
-    $$(CAIRO_CFLAGS) \
-))
-
 ## handle RandR 
 ifneq ($(ENABLE_RANDR),)
 $(eval $(call gb_Library_set_defs,vclplug_gen,\

vcl/unx/generic/gdi/salgdi3.cxx

@@ -83,9 +83,15 @@
 #include <graphite_serverfont.hxx>
 #endif
 
+#ifdef SYSTEM_CAIRO
 #include <cairo.h>
 #include <cairo-ft.h>
 #include <cairo-xlib-xrender.h>
+#else
+#include <cairo/cairo.h>
+#include <cairo/cairo-ft.h>
+#include <cairo/cairo-xlib-xrender.h>
+#endif
 
 struct BOX
 {