Mercurial > octave

diff m4/acinclude.m4 @ 32353:9067c860e0f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Avoid issue with AC_PATH_TOOL on Windows. * m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): qtpaths6 returns a Windows-style path on MinGW. But AC_PATH_TOOL seems to require a UNIX-style path. Convert the output from qtpath6 or qmake6 to a UNIX-style path on MinGW.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 27 Sep 2023 15:49:10 +0200
parents 469b078fe75b
children bf77e0f86f74
line wrap: on
line diff
--- a/m4/acinclude.m4	Wed Sep 27 14:55:51 2023 +0200
+++ b/m4/acinclude.m4	Wed Sep 27 15:49:10 2023 +0200
@@ -2100,6 +2100,16 @@
             QT_HOST_LIBEXECS=`$QMAKE6 -query QT_HOST_LIBEXECS`
           fi
         fi
+        if test -n "$QT_HOST_LIBEXECS"; then
+          case $host_os in
+            mingw*)
+              AC_CHECK_TOOL(CYGPATH, [cygpath])
+              if test -n "$CYGPATH"; then
+                QT_HOST_LIBEXECS=`$CYGPATH -u $QT_HOST_LIBEXECS`
+              fi
+            ;;
+          esac
+        fi
       ;;
     esac