[Libreoffice-commits] .: Branch 'libreoffice-3-6' - scp2/InstallModule_gnome.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source

[Libreoffice Gerrit user]

 scp2/InstallModule_gnome.mk        |    2 ++
 scp2/InstallScript_setup_osl.mk    |    2 +-
 scp2/Module_scp2.mk                |    2 +-
 scp2/source/gnome/module_gnome.scp |   12 ++++++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit bb1511c00acb25c607e8c885f33f1f313b5ea098
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 7 12:40:05 2012 +0200

    fdo#54450 install evolution DB driver correctly
    
    Change-Id: I0b6eb67014a61e22981f1f6be488fa762d639554
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index ea20b37..15e8116 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -33,9 +33,11 @@ $(eval $(call gb_InstallModule_use_packages,scp2/gnome,\
 ))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
+	ENABLE_EVOAB2 \
 	ENABLE_GCONF \
 	ENABLE_GIO \
 	ENABLE_GNOMEVFS \
+	ENABLE_GTK \
 	ENABLE_GTK3 \
 	ENABLE_LOCKDOWN \
 	ENABLE_SYSTRAY_GTK \
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 5eca444..cbe59b4 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(filter YES,$(WITH_EXTENSION_INTEGRATION)),\
 		scp2/extensions \
 	) \
-	$(if $(filter TRUE,$(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO)),\
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		scp2/gnome \
 	) \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 48f4686..c621cc5 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
 		InstallModule_crashrep \
 	) \
-	$(if $(filter TRUE,$(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO)),\
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		InstallModule_gnome \
 	) \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),\
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 88a2926..9194825 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -41,14 +41,16 @@ Module gid_Module_Optional_Gnome
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
     Files = (
+#ifdef ENABLE_EVOAB2
       gid_File_Lib_Evoab,
+#endif
+#ifdef ENABLE_GTK
       gid_File_Lib_Fps_Gnome,
       gid_File_Lib_Vclplug_Gtk,
+#endif
 #ifdef ENABLE_GTK3
       gid_File_Lib_Vclplug_Gtk3,
 #endif
-      gid_File_Bin_Gnome_Open_Url,
-      gid_File_Bin_Gnome_Open_Url_Bin,
 #ifdef ENABLE_SYSTRAY_GTK
       gid_File_Lib_QStart_Gtk,
 #endif
@@ -59,11 +61,13 @@ Module gid_Module_Optional_Gnome
       gid_File_Lib_GIO,
 #endif
 #ifdef ENABLE_GCONF
-      gid_File_Lib_Gconfbe
+      gid_File_Lib_Gconfbe,
 #endif
 #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-      gid_File_Share_Registry_Gnome_Xcd
+      gid_File_Share_Registry_Gnome_Xcd,
 #endif
+      gid_File_Bin_Gnome_Open_Url,
+      gid_File_Bin_Gnome_Open_Url_Bin
     );
 End