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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 21 08:00:13 UTC 2021


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

New commits:
commit 1281ea9176674a040ec08cf0014fdd75ca0b2fd1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 21 08:50:02 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 21 09:59:40 2021 +0200

    Avoid "test: : integer expression expected" on non-macOS platforms
    
    Change-Id: I90a31483b1750c59299e9a9f148990a8a68d4860
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122377
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index e592f6da8ce5..c03ea04085f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12024,7 +12024,7 @@ if test "$enable_skia" != "no" -a "$build_skia" = "yes" -a -z "$DISABLE_GUI"; th
             AC_SUBST(SKIA_GPU)
         fi
 
-        if test -n "$MAC_OS_X_VERSION_MIN_REQUIRED" -a "$MAC_OS_X_VERSION_MIN_REQUIRED" -lt "101200"; then
+        if test -n "$MAC_OS_X_VERSION_MIN_REQUIRED" && test "$MAC_OS_X_VERSION_MIN_REQUIRED" -lt "101200"; then
             SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX=1
             AC_SUBST(SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX)
         fi


More information about the Libreoffice-commits mailing list