diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-07 12:40:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-07 12:45:11 +0200 |
| commit | 5e19849479ee25e1ed1c7965588ce5497831614b (patch) | |
| tree | a25d04af2bc23b3746e8860f36106283e68155be | |
| parent | f77ecf6532d1920f86424e4e316db7c128ef95ce (diff) | |
fdo#54450 install evolution DB driver correctly
Change-Id: I0b6eb67014a61e22981f1f6be488fa762d639554
| -rw-r--r-- | scp2/InstallModule_gnome.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 2 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 12 |
4 files changed, 12 insertions, 6 deletions
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index ea20b37403e8..15e811688126 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 5eca44411f5c..cbe59b470497 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 48f4686cfc0f..c621cc523db2 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 88a2926bab9c..9194825a1113 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 |