diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-04-12 20:01:16 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-04-13 10:51:55 +0300 |
| commit | 25d2b02f452d7c27d02a93f5ad26d0b3834c0d84 (patch) | |
| tree | b1a4e0b177359353781502d5f9ef85a1a6baf2e4 | |
| parent | 88917210aae25d634f22fed9c916659f3515135a (diff) | |
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
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
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 |