rename to with_themes, and test scp2 a little

Conflicts:

	scp2/source/ooo/module_hidden_ooo.scp

configure.in

@@ -398,12 +398,6 @@ 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,
@@ -503,6 +497,12 @@ AC_ARG_WITH(vba-package-format,
                                  --with-vba-package-format="extn"
 ],,)
 
+AC_ARG_WITH(theme,
+    AS_HELP_STRING([--with-theme="theme1 theme2..."],
+	[Choose which themes to include. By default those themes with an '*' are included.
+         Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+
 AC_ARG_WITH(extension-integration,
 [
   --with-extension-integration      It will integrate the builded extensions
@@ -7077,6 +7077,24 @@ else
   SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
 fi
 
+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="default crystal hicontrast oxygen tango"
+fi
+
+  WITH_THEMES=""
+  for theme in $enable_theme
+  do
+    WITH_THEMES="$WITH_THEMES $theme"
+    SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
+  done
+  AC_MSG_RESULT([$WITH_THEMES])
+AC_SUBST(WITH_THEMES)
+
 dnl ===================================================================
 dnl Test whether to integrate extensions into the product's installer
 dnl ===================================================================
@@ -7399,26 +7417,6 @@ 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])
-
-AC_SUBST(ENABLE_THEMES)
-AC_SUBST(SCPDEFS)
-
 dnl ===================================================================
 dnl Test whether to enable ActiveX embedding
 dnl ===================================================================

scp2/source/ooo/file_ooo.scp

@@ -1842,12 +1842,14 @@ File gid_File_Jar_Productregistration
 End
 #endif
 
+#ifdef THEME_DEFAULT
 File gid_File_Images_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images.zip";
     Styles = (PACKED);
 End
+#endif
 
 #ifdef THEME_CRYSTAL
 File gid_File_ImagesCrystal_Zip

scp2/source/ooo/module_hidden_ooo.scp

@@ -712,12 +712,23 @@ Module gid_Module_Root_Files_Images
 	Sortkey = "2050";
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Images_Zip,
+	Files = (
+#ifdef THEME_DEFAULT
+	     gid_File_Images_Zip,
+#endif
+#ifdef THEME_CRYSTAL
              gid_File_ImagesCrystal_Zip,
+#endif
+#ifdef THEME_OXYGEN
              gid_File_ImagesOxygen_Zip,
+#endif
+#ifdef THEME_HICONTRAST
              gid_File_ImagesHicontrast_Zip,
-             gid_File_ImagesTango_Zip,
-             gid_File_ImagesClassic8_Zip);
+#endif
+#ifdef THEME_TANGO
+             gid_File_ImagesTango_Zip
+#endif
+	);
 End
 
 #ifndef WITHOUT_FONTS

set_soenv.in

@@ -1688,8 +1688,8 @@ 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( "WITH_THEMES",       "@WITH_THEMES@",      "e");
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
 ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );