[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0ca3064b05c477484c100c9d374b52d5e4ec454
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Feb 15 16:36:37 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Feb 15 17:26:45 2020 +0100

    IOBluetoothAddServiceDict is removed completely from MacOSX10.15.sdk
    
    ... (see Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
    MacOSX10.15.sdk/System/Library/Frameworks/IOBluetooth.framework/Headers/
    IOBluetoothUserLib.h), so e.g. --with-macosx-sdk=10.15
    --with-macosx-version-max-allowed=10.13 would have failed with
    
    > In file included from sd/source/ui/remotecontrol/BluetoothServer.mm:1:
    > sd/source/ui/remotecontrol/BluetoothServer.cxx:1477:19: error: use of undeclared identifier 'IOBluetoothAddServiceDict'
    >     IOReturn rc = IOBluetoothAddServiceDict(reinterpret_cast<CFDictionaryRef>(dict), &serviceRecordRef);
    >                   ^
    
    Change-Id: I520976c70ac0146953eb4d074e6e3d37a7cbffa1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88759
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index e186f6d3eb73..d7237b8dc061 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10836,7 +10836,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 && test "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+    if test $OS = MACOSX && test "$MACOSX_SDK_VERSION" -ge 101500; then
         # The Bluetooth code doesn't compile with macOS SDK 10.15
         enable_sdremote_bluetooth=no
     fi