summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-30 22:46:54 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-31 09:04:12 +0200
commitf684dd13292c8e1b8c4d318061c5fb302287d390 (patch)
tree03c53e69ff03c69ae8737d5335f76137667cc953 /scp2/source
parent21ce2a53e518e2e20c7736ef48f978d1e3c1d28b (diff)
Do not include cairo lib unless ENABLE_LIBRSVG, among others
(-DENABLE_CAIROCANVAS has apparently been unused.) Change-Id: Ib65ca0e8f5c8badab1f97e31bc61b1a49dabde76
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fea46d3e6289..50bfdaf55c49 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/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;