[Libreoffice] v2 of the configure.in/scp2 patch to allow selecting themes

This 2nd version also uses defines in the form of
-DTHEME_CRYSTAL that are being used in the scp2 module. Untested,
perhaps someone with a faster compile time than mine can see if the 

--enable-theme="crystal tango" or --enable-theme="" or --enable-theme=""
  (the latter 2 options should enable all themes" options work as
  intended.

This v2 patch needs to be applied together with the other patch to the
packimages module.

Someone also might want to check if I introduced forbidden bashisms. I
never know.

Attachment: pgpITXh3ixEzx.pgp
Description: PGP signature

From 6c379488250f5a3349dfc2d805f70a0f084fe07d Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Thu, 9 Dec 2010 12:23:55 +0100
Subject: [PATCHv2] Introduce an --enable-theme="theme1 theme2..." option

By default, we include all defaults as before, but if given, we can
limit the number of included themes with e.g. --enable-theme="oxygen
tango". This is passed through set_soenv and sets the environment
variable ENABLE_THEMES="...." which can be used by the packimages
makefile in the postprocess repository. It also adds defines in the
form of THEME_OXYGEN that are being used in the scp2 module to decide
if we should install the theme file or not.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---
 configure.in                 |   27 +++++++++++++++++++++++++++
 scp2/source/ooo/file_ooo.scp |    8 ++++++++
 set_soenv.in                 |    1 +
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index 7fe1e95..e776f50 100755
--- a/configure.in
+++ b/configure.in
@@ -487,6 +487,12 @@ AC_ARG_ENABLE(extra-font,
        [Add extra font content.]),
 ,)
 
+AC_ARG_ENABLE(theme,
+    AS_HELP_STRING([--enable-theme="theme1 theme2..."],
+       [Choose which themes to include. By default all available themes are included.
+         Possible choices: crystal, hicontrast, oxygen, tango.]),
+,)
+
 dnl ---------- Deprecated since 2010-11-05 ----------
 
 AC_ARG_ENABLE(mysql-connector,
@@ -7635,8 +7641,29 @@ else
 fi
 AC_SUBST(WITH_EXTRA_FONT)
 
+dnl ===================================================================
+dnl Test which themes to include
+dnl ===================================================================
+AC_MSG_CHECKING([which themes to include])
+# if none given, use all available themes
+if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
+  enable_theme="crystal hicontrast oxygen tango"
+fi
+
+  ENABLE_THEMES=""
+  for theme in $enable_theme
+  do
+    ENABLE_THEMES="$ENABLE_THEMES $theme"
+    SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
+  done
+  AC_MSG_RESULT([$ENABLE_THEMES $SCPDEFS])
+
+AC_SUBST(ENABLE_THEMES)
 AC_SUBST(SCPDEFS)
 
+dnl ===================================================================
+dnl Test whether to enable ActiveX embedding
+dnl ===================================================================
 if test "$_os" = "WINNT"; then
   AC_MSG_CHECKING([whether to enable ActiveX embedding of LibO components])
   if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o 
"$enable_activex_component" = ""; then
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0ab9fa2..64d91e5 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1843,33 +1843,41 @@ File gid_File_Images_Zip
     Styles = (PACKED);
 End
 
+#ifdef THEME_CRYSTAL
 File gid_File_ImagesCrystal_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_crystal.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_OXYGEN
 File gid_File_ImagesOxygen_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_oxygen.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_HICONTRAST
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_hicontrast.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_TANGO
 File gid_File_ImagesTango_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_tango.zip";
     Styles = (PACKED);
 End
+#endif
 
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
diff --git a/set_soenv.in b/set_soenv.in
index cc41e61..4985cb0 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1694,6 +1694,7 @@ ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
+ToFile( "ENABLE_THEMES",     "@ENABLE_THEMES@","e");
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
-- 
1.7.1


Sebastian