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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 26 06:32:21 UTC 2020


 configure.ac |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 62fa5bb8c1299469eacc21cb35ee670b65120713
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun Oct 25 23:26:51 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Oct 26 07:31:46 2020 +0100

    Must use the Unix form of a pathname in a test command on WSL
    
    (Using the Unix form doesn't hurt on Cygwin either.)
    
    Change-Id: I43c6c66feabadd9dec2287e440e5748db264fc6c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104788
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 958a525ee737..225d56d7e406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6158,9 +6158,10 @@ find_winsdk_version()
             if test -n "$regvalue"; then
                 winsdkbinsubdir="$regvalue".0
                 winsdklibsubdir=$winsdkbinsubdir
-                tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+                local tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+                local tmppath_unix=$(cygpath -u "$tmppath")
                 # test exist the SDK path
-                if test -d "$tmppath"; then
+                if test -d "$tmppath_unix"; then
                    # when path is convertible to a short path then path is okay
                    cygpath -d "$tmppath" >/dev/null 2>&1
                    if test $? -ne 0; then


More information about the Libreoffice-commits mailing list