diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-21 00:06:27 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-28 09:35:12 +0000 |
| commit | 7f4a622f9fbf27774efa908348e682df7280713b (patch) | |
| tree | c735f1768d0b7868ad7fcc43c8b5be517648b771 /configure.ac | |
| parent | 62d5b496b87b3beb6273da9643a1883fcd8afece (diff) | |
stop copying MSVC debug runtime DLLs
This is apparently not necessary with MSVC 2012; builds and all tests
run here without those DLLs in the solver.
Change-Id: If352fb3702d7dae57deb19959eab8eb0fedea318
Reviewed-on: https://gerrit.libreoffice.org/4414
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 42d1569b2069..e193a8a787ab 100644 --- a/configure.ac +++ b/configure.ac @@ -4909,28 +4909,13 @@ AC_MSG_NOTICE([checking msms =================================================== find_msvc_x64_dlls() { - if test "$CPUNAME" = "INTEL"; then - vsarch=x86 - else - vsarch=x64 - fi - msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" - MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT" msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll" - MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll" for dll in $msvcdlls; do if ! test -f "$msvcdllpath/$dll"; then AC_MSG_ERROR([can not find $dll in $msvcdllpath]) fi done - if test -n "$MSVC_USE_DEBUG_RUNTIME"; then - for dll in $MSVC_DEBUG_DLLS; do - if ! test -f "$MSVC_DEBUG_DLL_PATH/$dll"; then - AC_MSG_ERROR([can not find $dll in $MSVC_DEBUG_DLL_PATH]) - fi - done - fi } if test "$build_os" = "cygwin"; then @@ -6243,8 +6228,6 @@ fi AC_SUBST(MSVC_DLL_PATH) AC_SUBST(MSVC_DLLS) -AC_SUBST(MSVC_DEBUG_DLL_PATH) -AC_SUBST(MSVC_DEBUG_DLLS) AC_SUBST(MSM_PATH) AC_SUBST(MERGE_MODULES) |