diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index d0240806303f..7ccc9f1997c6 100644 --- a/configure.ac +++ b/configure.ac @@ -6640,13 +6640,21 @@ fi AC_SUBST([JITC_PROCESSOR_TYPE]) # Misc Windows Stuff -AC_ARG_WITH(vcredist-dir, - AS_HELP_STRING([--with-vcredist-dir], - [path to the directory with the arch-specific executables (vc_redist.x64.exe, vc_redist.x86.exe) - for packaging into the installsets (without those the target system needs to install - the Visual C++ Runtimes manually)]), +AC_ARG_WITH(ucrt-dir, + AS_HELP_STRING([--with-ucrt-dir], + [path to the directory with the arch-specific MSU packages of the Windows Universal CRT redistributables + (MS KB 2999226) for packaging into the installsets (without those the target system needs to install + the UCRT or Visual C++ Runtimes manually). The directory must contain the following 6 files: + Windows6.1-KB2999226-x64.msu + Windows6.1-KB2999226-x86.msu + Windows8.1-KB2999226-x64.msu + Windows8.1-KB2999226-x86.msu + Windows8-RT-KB2999226-x64.msu + Windows8-RT-KB2999226-x86.msu + A zip archive including those files is available from Microsoft site: + https://www.microsoft.com/en-us/download/details.aspx?id=48234]), ,) -VCREDIST_DIR="$with_vcredist_dir" +UCRT_REDISTDIR="$with_ucrt_dir" if test $_os = "WINNT"; then find_msvc_x64_dlls find_msms @@ -6659,20 +6667,23 @@ if test $_os = "WINNT"; then else SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" fi - if test "$VCREDIST_DIR" = "no"; then + if test "$UCRT_REDISTDIR" = "no"; then dnl explicitly disabled - VCREDIST_DIR="" - else - if test -f "$VCREDIST_DIR/vc_redist.$WINDOWS_SDK_ARCH.exe"; then - VCREDIST_EXE="vc_redist.$WINDOWS_SDK_ARCH.exe" - else - VCREDIST_DIR="" + UCRT_REDISTDIR="" + else + if ! test -f "$UCRT_REDISTDIR/Windows6.1-KB2999226-x64.msu" -a \ + -f "$UCRT_REDISTDIR/Windows6.1-KB2999226-x86.msu" -a \ + -f "$UCRT_REDISTDIR/Windows8.1-KB2999226-x64.msu" -a \ + -f "$UCRT_REDISTDIR/Windows8.1-KB2999226-x86.msu" -a \ + -f "$UCRT_REDISTDIR/Windows8-RT-KB2999226-x64.msu" -a \ + -f "$UCRT_REDISTDIR/Windows8-RT-KB2999226-x86.msu"; then + UCRT_REDISTDIR="" if test -n "$PKGFORMAT"; then for i in $PKGFORMAT; do case "$i" in msi) - AC_MSG_WARN([--without-vcredist-dir not specified or exe not found - installer will have runtime dependency]) - add_warning "--without-vcredist-dir not specified or exe not found - installer will have runtime dependency" + AC_MSG_WARN([--without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency]) + add_warning "--without-ucrt-dir not specified or MSUs not found - installer will have runtime dependency" ;; esac done @@ -6681,8 +6692,7 @@ if test $_os = "WINNT"; then fi fi -AC_SUBST(VCREDIST_DIR) -AC_SUBST(VCREDIST_EXE) +AC_SUBST(UCRT_REDISTDIR) AC_SUBST(MSVC_DLL_PATH) AC_SUBST(MSVC_DLLS) AC_SUBST(MSM_PATH) |