summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-15 16:04:31 +0200
committerMichael Meeks <michael.meeks@suse.com>2013-05-15 16:14:21 +0100
commit0c99c1c2cafabf72b7cb32fc313441e52fd2876a (patch)
tree2cde382ce7cfe84bf19ef92aeeced41019d60cd5 /scp2
parentfbf2e9f733e1e5b6c9d2cdada0317c89c1a3b71f (diff)
gallery: allow disabling the from-source build in configure
Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_ooo.mk1
-rw-r--r--scp2/source/ooo/file_extra_ooo.scp4
2 files changed, 5 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index e37484d09d77..40cdafc335c7 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
SYSTEM_REDLAND \
SYSTEM_SNDFILE \
SYSTEM_STDLIBS \
+ WITH_GALLERY_BUILD \
WITH_MOZAB4WIN \
WITH_MYSPELL_DICTS \
))
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index f6d731e51248..65048ec0a280 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -161,6 +161,8 @@ File gid_File_Extra_Gallroot
Name = "extras_gallroot.filelist";
End
+#if defined (WITH_GALLERY_BUILD)
+
GALLERY_FILELIST(arrows)
GALLERY_FILELIST(computers)
GALLERY_FILELIST(diagrams)
@@ -173,6 +175,8 @@ GALLERY_FILELIST(symbols)
GALLERY_FILELIST(transportation)
GALLERY_FILELIST(txtshapes)
+#endif
+
File gid_File_Extra_Gallmytheme
Dir = FILELIST_DIR;
USER_FILE_BODY;