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

[Tomoyuki Kubota (via logerrit)]

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

New commits:
commit 78b4c7ae30926d1c908c4d67f7ebc6b0565ea200
Author:     Tomoyuki Kubota <himajin100000 at gmail.com>
AuthorDate: Wed Jun 12 02:39:56 2019 +0900
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Jun 13 11:04:46 2019 +0200

    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.lunak at collabora.com>

diff --git a/configure.ac b/configure.ac
index 2586ca81c1bf..f8c63cc778d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10347,7 +10347,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