diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 11:10:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 13:06:03 +0000 |
| commit | ad627912b5390ca46dde34815add876b0ae24bab (patch) | |
| tree | d7c1539c585e9daab055dc432b0c52a20c8ea229 /scp2 | |
| parent | aa7ceb44cf018d092ce09bb1572d7ce4876be513 (diff) | |
move gio config into its own separate config header
Change-Id: I25ca238931da039c244c2af6171d69c9875f95ff
Reviewed-on: https://gerrit.libreoffice.org/22501
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_gnome.mk | 1 | ||||
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 3 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index a2d1c88bee4d..ac3a1fd9b0ce 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ - ENABLE_GIO \ ENABLE_GTK \ )) diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index f64ad4220b6d..3f4b8f55810b 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -16,8 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "macros.inc" +#include "config_gio.h" -#if defined ENABLE_GIO +#if ENABLE_GIO File gid_File_Share_Registry_Gnome_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 08d9efeb7f57..e1c58621f9b1 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -17,6 +17,7 @@ */ #include "macros.inc" +#include "config_gio.h" #include "AutoInstall/gnome" @@ -27,7 +28,7 @@ Module gid_Module_Optional_Gnome MOD_NAME_DESC(MODULE_OPTIONAL_GNOME); Styles = (); Files = (auto_gnome_ALL, -#if defined ENABLE_GIO +#if ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif gid_File_Bin_Gnome_Open_Url |