configure.ac | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 3e9620707a029720ce7b293206961c5e73f1565f
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Sun Oct 25 23:30:11 2020 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Oct 26 07:28:35 2020 +0100
Make more of the Windows SDK checks work on WSL
Part of work in progress. Committing in smaller bits to make potential
bisecting easier.
Change-Id: I604bdd993288369051b3365014be54090f987559
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104789
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 31ec94fb9856..958a525ee737 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6304,7 +6304,7 @@ dnl Check for the Windows SDK.
dnl =========================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for Windows SDK])
- if test "$build_os" = "cygwin"; then
+ if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
find_winsdk
WINDOWS_SDK_HOME=$winsdktest
@@ -6367,7 +6367,8 @@ the Windows SDK are installed.])
fi
PathFormat "$WINDOWS_SDK_HOME"
WINDOWS_SDK_HOME="$formatted_path"
- if test "$build_os" = "cygwin"; then
+ WINDOWS_SDK_HOME_unix="$formatted_path_unix"
+ if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/Include"
if test -d "$WINDOWS_SDK_HOME/include/um"; then
SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include/um
-I$WINDOWS_SDK_HOME/include/shared"
@@ -6385,21 +6386,25 @@ the Windows SDK are installed.])
dnl msiglobal.pm:
if test -z "$WINDOWS_SDK_WILANGID" -a -n "$WINDOWS_SDK_HOME"; then
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
- if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+ WINDOWS_SDK_WILANGID_unix=$(cygpath -u "$WINDOWS_SDK_WILANGID")
+ if ! test -e "$WINDOWS_SDK_WILANGID_unix" ; then
WINDOWS_SDK_WILANGID="${WINDOWS_SDK_HOME}/bin/${WINDOWS_SDK_LIB_SUBDIR}/${WIN_BUILD_ARCH}/WiLangId.vbs"
+ WINDOWS_SDK_WILANGID_unix=$(cygpath -u "$WINDOWS_SDK_WILANGID")
fi
- if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+ if ! test -e "$WINDOWS_SDK_WILANGID_unix" ; then
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$WIN_BUILD_ARCH/WiLangId.vbs
+ WINDOWS_SDK_WILANGID_unix=$(cygpath -u "$WINDOWS_SDK_WILANGID")
fi
- if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+ if ! test -e "$WINDOWS_SDK_WILANGID_unix" ; then
WINDOWS_SDK_WILANGID=$(cygpath -sm "C:/Program Files (x86)/Windows
Kits/8.1/bin/$WIN_BUILD_ARCH/WiLangId.vbs")
+ WINDOWS_SDK_WILANGID_unix=$(cygpath -u "$WINDOWS_SDK_WILANGID")
fi
fi
if test -n "$with_lang" -a "$with_lang" != "en-US"; then
if test -n "$with_package_format" -a "$with_package_format" != no; then
for i in "$with_package_format"; do
if test "$i" = "msi"; then
- if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+ if ! test -e "$WINDOWS_SDK_WILANGID_unix" ; then
AC_MSG_ERROR([WiLangId.vbs not found - building
translated packages will fail])
fi
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
