[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

 configure.ac |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 535006f3657feb2a64b50fb879e73294ab726852
Author: Andras Timar <atimar at suse.com>
Date:   Thu Jan 24 10:50:26 2013 +0100

    fix MSM name for x64 in the VC90 case
    
    Change-Id: I69ff4f69e3ef93ed36cdcda9c54513624e8c98d0

diff --git a/configure.ac b/configure.ac
index d8ef0d5..dc13c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4962,21 +4962,27 @@ find_msms()
         if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
             msms="$msms policy_9_0_Microsoft_VC90_CRT_x86.msm"
         else
-            AC_MSG_ERROR([Merge modules not found])
+            AC_MSG_ERROR([Merge module policy_9_0_Microsoft_VC90_CRT_x86.msm not found])
         fi
     fi
 
     if test "$BUILD_X64" = TRUE; then
-        if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
-            msms="$msms Microsoft_VC${VCVER}_CRT_x64.msm"
-        else
-            AC_MSG_ERROR([Failed to copy x64 merge modules])
-        fi
         if test "$VCVER" = "90"; then
             if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86_x64.msm; then
                 msms="$msms policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"
             else
-                AC_MSG_ERROR([Merge modules not found])
+                AC_MSG_ERROR([Merge module policy_9_0_Microsoft_VC90_CRT_x86_x64.msm not found])
+            fi
+            if test -e $msmdir/Microsoft_VC90_CRT_x86_x64.msm; then
+                msms="$msms Microsoft_VC90_CRT_x86_x64.msm"
+            else
+                AC_MSG_ERROR([Merge module Microsoft_VC90_CRT_x86_x64.msm not found])
+            fi
+        else
+            if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
+                msms="$msms Microsoft_VC${VCVER}_CRT_x64.msm"
+            else
+                AC_MSG_ERROR([Merge module Microsoft_VC${VCVER}_CRT_x64.msm not found])
             fi
         fi
     fi