diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:44:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:44:41 +0000 |
| commit | 122257fe10e373bdfadae38746f4f82ade9722db (patch) | |
| tree | 4664022ec62beb8bf3b6e3a878295f18a4debf47 /scp2/source/gnome | |
| parent | 5a900869e2c82223cf907028509b9437b64d263f (diff) | |
INTEGRATION: CWS sb91 (1.12.102); FILE MERGED
2008/07/17 15:58:23 sb 1.12.102.1: #i91721# added explicit ENABLE_GCONF (had previously been covered by ENABLE_GNOMEVFS, but unxsolu4 does not support the latter but does support the former)
Diffstat (limited to 'scp2/source/gnome')
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index b04a0b43e13a..62e013b8bfd8 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: module_gnome.scp,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -45,7 +45,9 @@ Module gid_Module_Optional_Gnome PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_GNOME); Styles = (DONTSHOWINUSERINSTALL); +#ifdef ENABLE_GNOMEVFS XpdCheckSolaris = "SUNWgnome-vfs"; +#endif Files = ( #ifdef ENABLE_GNOMEVFS gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, @@ -53,6 +55,9 @@ Module gid_Module_Optional_Gnome #ifdef ENABLE_GIO gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu #endif - gid_File_Lib_Gconfbe); +#ifdef ENABLE_GCONF + gid_File_Lib_Gconfbe +#endif + ); End |