Do not include cairo lib unless ENABLE_LIBRSVG, among others

(-DENABLE_CAIROCANVAS has apparently been unused.)

Change-Id: Ib65ca0e8f5c8badab1f97e31bc61b1a49dabde76

scp2/InstallModule_ooo.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_InstallModule_use_packages,scp2/ooo,\
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	DISABLE_ATL \
 	DISABLE_NEON \
+	ENABLE_CAIRO_CANVAS \
 	ENABLE_DIRECTX \
 	ENABLE_EVOAB2 \
 	ENABLE_GTK \
@@ -143,9 +144,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	$(if $(filter MACOSX,$(OS)),\
-		-DENABLE_CAIROCANVAS \
-	) \
 	$(if $(filter INTERNAL,$(ENABLE_LIBRSVG)),\
 		-DENABLE_LIBRSVG \
 	) \

scp2/source/ooo/file_library_ooo.scp

@@ -569,7 +569,10 @@ End
 
 #ifndef LIBO_HEADLESS
 
-#ifndef SYSTEM_CAIRO
+#if !defined SYSTEM_CAIRO \
+    && (defined ENABLE_CAIRO_CANVAS \
+        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG) \
+        || (defined WNT && !defined ENABLE_DIRECTX))
 
 File gid_File_Lib_Cairo
     LIB_FILE_BODY;