diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-07-08 16:33:32 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-08-08 12:45:12 +0200 |
| commit | 02addb3618f026acd72ece76fc726b9473cc5940 (patch) | |
| tree | d504a9c4f88f902ae5d75113fe48c2ed1935d095 /sd | |
| parent | 2c00f5c896bee61033b93ddb9f32d959b0b01e94 (diff) | |
tdf#112343 Change dependency from dbus-glib to dbus
Add check for GLib support for modules which depends on
dbus and glib separately.
Also fix copy-paste typo.
Change-Id: Ibd33573b2f8dff9e0a7f2e0fc983d93878bb5357
Reviewed-on: https://gerrit.libreoffice.org/57157
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 11 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.hxx | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 563f0d833ee8..67109b97c960 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -108,6 +108,15 @@ $(eval $(call gb_Library_use_externals,sd,\ icu_headers \ )) +ifneq ($(DBUS_HAVE_GLIB),) +$(eval $(call gb_Library_add_defs,sd,\ + $(DBUS_GLIB_CFLAGS) \ +)) +$(eval $(call gb_Library_add_libs,sd,\ + $(DBUS_GLIB_LIBS) \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,sd,\ uuid \ @@ -172,7 +181,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/accessibility/AccessibleSlideSorterView \ sd/source/ui/accessibility/AccessibleViewForwarder \ sd/source/ui/accessibility/SdShapeTypes \ - sd/source/ui/animations/CategoryListBox \ + sd/source/ui/animations/CategoryListBox \ sd/source/ui/animations/CustomAnimationBox \ sd/source/ui/animations/CustomAnimationDialog \ sd/source/ui/animations/CustomAnimationList \ diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx index b5d6f78aa2b8..987e5c611786 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.hxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx @@ -15,7 +15,7 @@ #include <config_dbus.h> -#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && ENABLE_DBUS +#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && ENABLE_DBUS && DBUS_HAVE_GLIB # define LINUX_BLUETOOTH #endif |