diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | external/Module_external.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_windows.mk | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 236e6832569c..374fd405973a 100644 --- a/configure.ac +++ b/configure.ac @@ -4831,6 +4831,7 @@ find_winsdk() find_msms() { +AC_MSG_NOTICE([checking msms ======================================================]) for ver in 10.0 11.0; do reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir if test -n "$regvalue"; then @@ -4847,10 +4848,15 @@ find_msms() msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -u "$msmdir"` if test -z "$msmdir"; then - AC_MSG_ERROR([Merge modules not found]) + if test "$ENABLE_RELEASE_BUILD" = "FALSE" ; then + AC_MSG_WARN([Merge modules not found in $msmdir]) + msmdir="" + else + AC_MSG_ERROR([Merge modules not found in $msmdir]) + fi + else + msms="Microsoft_VC${VCVER}_CRT_x86.msm" fi - - msms="Microsoft_VC${VCVER}_CRT_x86.msm" } find_msvc_x64_dlls() @@ -6052,6 +6058,7 @@ if test $_os = "WINNT" -a "$WITH_MINGW" != yes; then MERGE_MODULES="$msms" SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" fi + AC_SUBST(MSVC_DLL_PATH) AC_SUBST(MSVC_DLLS) AC_SUBST(MSVC_DEBUG_DLL_PATH) diff --git a/external/Module_external.mk b/external/Module_external.mk index b81654a9f747..8cda13e6658a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -24,7 +24,7 @@ endif ifeq ($(COM),MSC) $(eval $(call gb_Module_add_targets,external,\ Package_dbghelp \ - Package_msms \ + $(if $(MSM_PATH),Package_msms) \ Package_msvc_dlls \ $(if $(MSVC_USE_DEBUG_RUNTIME),Package_msvc_dlls_debug) \ $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk index 0caaa479b4ea..296f7fccfa5b 100644 --- a/scp2/InstallModule_windows.mk +++ b/scp2/InstallModule_windows.mk @@ -21,7 +21,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/windows,\ $(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\ scp2/source/ooo/folder_ooo \ - scp2/source/ooo/vc_redist \ + $(if $(MSM_PATH),scp2/source/ooo/vc_redist) \ scp2/source/ooo/windowscustomaction_ooo \ )) |