[Libreoffice-commits] core.git: configure.ac

[Tomofumi Yagi]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3bfe3bfca27dcc4cb00a85c2b30a5a50f5bad689
Author: Tomofumi Yagi <yagit at mknada.sakura.ne.jp>
Date:   Tue Jul 16 20:53:44 2013 +0900

    Add another fallback-path for wilangid.vbs(work it again)
    
    Searching mechanism for wilangid.vbs(commit 265cc57) doesn't work
    after commit 7f4a622("stop copying MSVC debug runtime DLLs").
    That commit deleted $vsarch environment.
    In configure,using $WINDWOS_SDK_ARCH instead of $vsarch will make it work
    again(that is still set).
    
    Change-Id: Ia45d30b2a724a36543038b14dd8defc3647ae455
    Reviewed-on: https://gerrit.libreoffice.org/4935
    Reviewed-by: Jan Holesovsky <kendy at suse.cz>
    Tested-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/configure.ac b/configure.ac
index 365391d..566b38c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9137,7 +9137,7 @@ the  Windows SDK are installed.])
     if test -z "$WINDOWS_SDK_WILANGID" -a -n "$WINDOWS_SDK_HOME"; then
         WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
         if ! test -e "$WINDOWS_SDK_WILANGID" ; then
-            WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$vsarch/WiLangId.vbs
+            WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs
         fi
         if ! test -e "$WINDOWS_SDK_WILANGID" ; then
             AC_MSG_WARN([WiLangId.vbs not found - building translated packages will fail])