move gio config into its own separate config header

Change-Id: I25ca238931da039c244c2af6171d69c9875f95ff
Reviewed-on: https://gerrit.libreoffice.org/22501Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

RepositoryExternal.mk

@@ -2446,10 +2446,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$(GIO_CFLAGS) \
 )
 
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DENABLE_GIO \
-)
-
 $(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS))
 
 endef

config_host/config_gio.h.in

+/*
+
+Settings for gio header file dection
+
+*/
+
+#ifndef CONFIG_GIO_H
+#define CONFIG_GIO_H
+
+#define ENABLE_GIO 0
+
+#endif

config_host/config_vclplug.h.in

@@ -10,6 +10,5 @@ Settings about which X11 desktops have support enabled.
 #define ENABLE_GTK 0
 #define ENABLE_KDE4 0
 #define ENABLE_TDE 0
-#define ENABLE_GIO 0
 
 #endif

configure.ac

@@ -12852,6 +12852,7 @@ AC_CONFIG_HEADERS([config_host/config_cups.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_folders.h])
 AC_CONFIG_HEADERS([config_host/config_gcc.h])
+AC_CONFIG_HEADERS([config_host/config_gio.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
 AC_CONFIG_HEADERS([config_host/config_java.h])

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

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);

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

sfx2/source/appl/shutdowniconunx.cxx

@@ -32,7 +32,9 @@
 #include "app.hrc"
 #include "shutdownicon.hxx"
 
-#ifdef ENABLE_GIO
+#include <config_gio.h>
+
+#if ENABLE_GIO
 #include <gio/gio.h>
 #endif
 
@@ -59,7 +61,7 @@ static GtkStatusIcon* pTrayIcon;
 static GtkWidget *pExitMenuItem = nullptr;
 static GtkWidget *pOpenMenuItem = nullptr;
 static GtkWidget *pDisableMenuItem = nullptr;
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
 GFileMonitor* pMonitor = nullptr;
 #endif
 
@@ -293,7 +295,7 @@ static gboolean display_menu_cb( GtkWidget *,
     return sal_True;
 }
 
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
 /*
  * If the quickstarter is running, then LibreOffice is
  * upgraded, then the old quickstarter is still running, but is now unreliable
@@ -353,7 +355,7 @@ void plugin_init_sys_tray()
     pShutdownIcon->SetVeto( true );
     ShutdownIcon::addTerminateListener();
 
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
     GFile* pFile = nullptr;
     OUString sLibraryFileUrl;
     if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
@@ -374,7 +376,7 @@ void plugin_shutdown_sys_tray()
     if( !pTrayIcon )
         return;
 
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
     if (pMonitor)
     {
         g_signal_handlers_disconnect_by_func(pMonitor,

vcl/inc/unx/gtk/gtkframe.hxx

@@ -47,7 +47,7 @@
 #include <list>
 #include <vector>
 
-#include <config_vclplug.h>
+#include <config_gio.h>
 
 #include "headless/svpgdi.hxx"
 

vcl/inc/unx/gtk/gtksalmenu.hxx

@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
 
-#include <config_vclplug.h>
+#include <config_gio.h>
 
 #include <vector>
 #if ENABLE_GIO

vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx

@@ -23,7 +23,7 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
-#include <config_vclplug.h>
+#include <config_gio.h>
 
 #include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/frame/Desktop.hpp>

vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx

@@ -23,7 +23,7 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
-#include <config_vclplug.h>
+#include <config_gio.h>
 
 #include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/frame/Desktop.hpp>

vcl/unx/gtk/gtksalframe.cxx

@@ -39,7 +39,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
 
-#include <config_vclplug.h>
+#include <config_gio.h>
 
 #include <unx/x11/xlimits.hxx>
 #if defined(ENABLE_DBUS) && ENABLE_GIO

vcl/unx/gtk3/gtk3gtkframe.cxx

@@ -38,7 +38,7 @@
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
 
-#include <config_vclplug.h>
+#include <config_gio.h>
 
 #if defined(ENABLE_DBUS) && ENABLE_GIO
 #  include <unx/gtk/gtksalmenu.hxx>