configure.ac | 4 ++++
sd/Library_sd.mk | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 9d507d31b262b271d259b4314d3d5cab373ab5a6
Author: Tomoyuki Kubota <himajin100...@gmail.com>
AuthorDate: Wed Jun 12 02:39:56 2019 +0900
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Nov 19 23:59:10 2019 +0100
test command does not do short-circuit evaluation
Change-Id: Iaaeb479698c79f2cea3fd2e3914c17d3a2692981
Reviewed-on: https://gerrit.libreoffice.org/73837
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/configure.ac b/configure.ac
index e10bf8849044..3c3291d8a5b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10198,7 +10198,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" !=
"no"; then
ENABLE_SDREMOTE=TRUE
AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote
control])
- if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+ if test $OS = MACOSX && test "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500;
then
# The Bluetooth code doesn't compile with macOS SDK 10.15
enable_sdremote_bluetooth=no
fi
commit dce3478ab53b679f4a6a8d8a903cb6a2e938dbd1
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Jun 5 02:06:00 2019 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Nov 19 23:59:10 2019 +0100
The Bluetooth code doesn't compile with macOS SDK 10.15
Change-Id: I8fffa4cef9628e6872c881cd0cbdfe85495fa324
diff --git a/configure.ac b/configure.ac
index bfcc32b65d2e..e10bf8849044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10198,6 +10198,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" !=
"no"; then
ENABLE_SDREMOTE=TRUE
AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote
control])
+ if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+ # The Bluetooth code doesn't compile with macOS SDK 10.15
+ enable_sdremote_bluetooth=no
+ fi
# If not explicitly enabled or disabled, default
if test -z "$enable_sdremote_bluetooth"; then
case "$OS" in
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 67109b97c960..02642bf724d8 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -518,6 +518,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\
sd/source/ui/remotecontrol/OSXNetworkService \
))
+$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
+ Foundation \
+))
+
else # OS!=MACSOX
ifeq ($(ENABLE_AVAHI),TRUE)
@@ -566,7 +570,6 @@ $(eval $(call gb_Library_add_libs,sd,\
))
$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
- Foundation \
IOBluetooth \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
