diff options
| author | Moonchild <wolfbeast@users.noreply.github.com> | 2016-10-05 17:32:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 17:32:55 +0200 |
| commit | 4be2052a17104608a755a85aa882826bcb07b6d3 (patch) | |
| tree | f838ce85cee488b6fb1705b7e216fc04a2b7098f /configure.in | |
| parent | b18d7409007db6f91034d493c5a73890159713c3 (diff) | |
| parent | b674aef5e2762440a95a9f19658fe98cec524faa (diff) | |
| download | palemoon-gre-4be2052a17104608a755a85aa882826bcb07b6d3.tar.gz | |
Merge pull request #556 from binoc-central/win32redist-work
Expand WIN32 redist file capabilities
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 269b975c8..ec8256636 100644 --- a/configure.in +++ b/configure.in @@ -501,8 +501,11 @@ case "$target" in if test "$_CC_MAJOR_VERSION" = "18" -a "$_CC_BUILD_VERSION" -ge "30723"; then _CC_SUITE=12 MSVS_VERSION=2013 + MSVC_REDIST_CRT_DIR=Microsoft.VC120.CRT MSVC_C_RUNTIME_DLL=msvcr120.dll MSVC_CXX_RUNTIME_DLL=msvcp120.dll + MSVC_REDIST_OPENMP_DIR=Microsoft.VC120.OPENMP + MSVC_OPENMP_DLL=vcomp120.dll elif test "$_CC_MAJOR_VERSION" = "19"; then _CC_SUITE=14 MSVS_VERSION=2015 @@ -527,8 +530,11 @@ You must install Visual C++ 2013 Update 3 or newer in order to build. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) fi AC_SUBST(MSVS_VERSION) + AC_SUBST(MSVC_REDIST_CRT_DIR) AC_SUBST(MSVC_C_RUNTIME_DLL) AC_SUBST(MSVC_CXX_RUNTIME_DLL) + AC_SUBST(MSVC_REDIST_OPENMP_DIR) + AC_SUBST(MSVC_OPENMP_DLL) AC_SUBST(MSVC_APPCRT_DLL) AC_SUBST(MSVC_DESKTOPCRT_DLL) @@ -545,6 +551,10 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) if test ! -d "$WIN32_REDIST_DIR"; then AC_MSG_ERROR([Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}]) fi + + if test -f "$WIN32_REDIST_DIR/$MSVC_C_RUNTIME_DLL"; then + AC_MSG_ERROR([The Win32 Redist directory must be set to the directory above Microsoft.VCXX0.CRT]) + fi WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd` fi |