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

[Tor Lillqvist]

 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 25d2b02f452d7c27d02a93f5ad26d0b3834c0d84
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 12 20:01:16 2017 +0300

    Look for msi*.exe in configure in one more place (where they are in my case)
    
    Not sure if the build would actually find them later when needed, but
    as I typically don't build with --with-package-format=msi, I assume
    that the MSI tools won't be used.
    
    Change-Id: I808cbed152c7a1ba4e9222650b731548dc2a54a8

diff --git a/configure.ac b/configure.ac
index 21691d71097c..3ea8fea548cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5465,6 +5465,10 @@ if test "$build_os" = "cygwin"; then
          -a -f "$WINDOWS_SDK_BINDIR_NO_ARCH/x86/msidb.exe" \
          -a -f "$WINDOWS_SDK_BINDIR_NO_ARCH/x86/uuidgen.exe" \
          -a -f "$WINDOWS_SDK_BINDIR_NO_ARCH/x86/msitran.exe"; then :
+    elif test -f "$WINDOWS_SDK_HOME/bin/x86/msiinfo.exe" \
+         -a -f "$WINDOWS_SDK_HOME/bin/x86/msidb.exe" \
+         -a -f "$WINDOWS_SDK_BINDIR_NO_ARCH/x86/uuidgen.exe" \
+         -a -f "$WINDOWS_SDK_HOME/bin/x86/msitran.exe"; then :
     else
         AC_MSG_ERROR([Some (all?) Windows Installer tools in the Windows SDK are missing, please install.])
     fi