diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-11-16 20:59:16 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-16 20:59:16 +0100 |
| commit | 41e995ec361cd466a3f287d3eb33c0080bdbb50c (patch) | |
| tree | f41cc1e5bd2c1241902f980cb062fd70bbd8b881 /post_download.in | |
| parent | 042247b3e428cb7352c06a670576819c67378090 (diff) | |
x64 merge modules are not mandatory, only warn when they are missing.
Diffstat (limited to 'post_download.in')
| -rw-r--r-- | post_download.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/post_download.in b/post_download.in index c93cd270da71..ea6b9433adb7 100644 --- a/post_download.in +++ b/post_download.in @@ -38,9 +38,7 @@ dnl =================================================================== dnl Windows builds - use oowintool to copy CRT dlls and manifest dnl =================================================================== if test "$COM" = "MSC"; then - if ./oowintool --msvc-copy-dlls ./external/msvcp ; then - : - else + if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then AC_MSG_ERROR([oowintool failed to copy CRT]) fi fi @@ -49,11 +47,13 @@ dnl =================================================================== dnl Windows builds - use oowintool to copy VC redist merge modules dnl =================================================================== if test "$COM" = "MSC"; then - if ./oowintool --msvc-copy-msms ./external/msm90 ; then - : - else + if ! ./oowintool --msvc-copy-msms ./external/msm90 ; then AC_MSG_ERROR([oowintool failed to copy merge modules]) fi + if ! ./oowintool --msvc-copy-msms-64 ./external/msm90 ; then + AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation +will lack the 64-bit Explorer extension]) + fi fi dnl =================================================================== |