fdo#54450 install evolution DB driver correctly

Change-Id: I0b6eb67014a61e22981f1f6be488fa762d639554
This commit is contained in:
David Tardon 2012-09-07 12:40:05 +02:00
parent f77ecf6532
commit 5e19849479
4 changed files with 12 additions and 6 deletions

View file

@ -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 \

View file

@ -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)),\

View file

@ -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)),\

View file

@ -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