[Libreoffice-commits] .: configure.in

Kalman "" Szalai kami911 at kemper.freedesktop.org
Tue Nov 30 05:17:34 PST 2010


 configure.in |   41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

New commits:
commit 352d58cceffa4e5e5fdf29c288ae4b0df5960804
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Nov 30 13:46:42 2010 +0100

    Adds OxygenOffice extras as configurable optional
    
     Introduces:
     --enable-extra-gallery  - for additional galleries
     --enable-extra-template - for additional templates
     --enable-extra-sample   - for additional samples
     --enable-extra-font     - for additional fonts
     configure options.

diff --git a/configure.in b/configure.in
index 99184c2..eb5c7c0 100755
--- a/configure.in
+++ b/configure.in
@@ -169,6 +169,26 @@ AC_ARG_ENABLE(odk,
                           some packagers may wish to build without.],
 ,)
 
+AC_ARG_ENABLE(extra-gallery,
+[
+  --enable-extra-gallery  Add extra gallery content.],
+,)
+
+AC_ARG_ENABLE(extra-template,
+[
+  --enable-extra-template Add extra template content.],
+,)
+
+AC_ARG_ENABLE(extra-sample,
+[
+  --enable-extra-sample   Add extra sample content.],
+,)
+
+AC_ARG_ENABLE(extra-font,
+[
+  --enable-extra-font     Add extra font content.],
+,)
+
 AC_ARG_ENABLE(post-install-scripts,
 [
   --disable-post-install-scripts
@@ -962,13 +982,28 @@ OOOP_FONTS_PACK=
 OOOP_GALLERY_PACK=
 OOOP_SAMPLES_PACK=
 OOOP_TEMPLATES_PACK=
+
+if test "z$with_distro" = "zOxygenOfficeLinux" -o \
+        "z$with_distro" = "zOxygenOfficeWindows" -o \
+        "z$enable_extra_gallery" = "zyes" ; then
+    OOOP_GALLERY_PACK="OOOP-gallery-pack-2.8.0.0.zip"    
+fi
 if test "z$with_distro" = "zOxygenOfficeLinux" -o \
-        "z$with_distro" = "zOxygenOfficeWindows" ; then
+        "z$with_distro" = "zOxygenOfficeWindows" -o \
+        "z$enable_extra_template" = "zyes" ; then
+    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.8.0.0.zip"
+fi
+if test "z$with_distro" = "zOxygenOfficeLinux" -o \
+        "z$with_distro" = "zOxygenOfficeWindows" -o \
+        "z$enable_extra_font" = "zyes" ; then
     OOOP_FONTS_PACK="OOOP-fonts-pack-2.8.0.1.zip"
-    OOOP_GALLERY_PACK="OOOP-gallery-pack-2.8.0.0.zip"
+fi
+if test "z$with_distro" = "zOxygenOfficeLinux" -o \
+        "z$with_distro" = "zOxygenOfficeWindows" -o \
+        "z$enable_extra_sample" = "zyes" ; then
     OOOP_SAMPLES_PACK="OOOP-samples-pack-2.7.0.0.zip"
-    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.8.0.0.zip"
 fi
+
 AC_SUBST(OOOP_FONTS_PACK)
 AC_SUBST(OOOP_GALLERY_PACK)
 AC_SUBST(OOOP_SAMPLES_PACK)


More information about the Libreoffice-commits mailing list