configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 265cc578b0a27c44fda115407d841aa821384b71
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Sun Jun 23 22:45:54 2013 +0200
Add another fallback-path for wilangid.vbs
on Windows Server 2012, it ends up in
c:/Program Files (x86)/Windows Kits/8.0/bin/x86/wilangid.vbs and
c:/Program Files (x86)/Windows Kits/8.0/bin/x64/wilangid.vbs
(files are identical)
No full-blown configure check is needed IMHO, since that stuff is part
of a bigger install, and not installed separately.
AFAICT it is only used when building the translated installsets
Change-Id: I1238717bb08635848bb4c54bf4f6b4049e0bc777
Reviewed-on: https://gerrit.libreoffice.org/4468
Reviewed-by: Andras Timar <ati...@suse.com>
Tested-by: Andras Timar <ati...@suse.com>
diff --git a/configure.ac b/configure.ac
index 765bf72..ba3a316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9133,6 +9133,13 @@ the Windows SDK are installed.])
dnl msiglobal.pm:
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
+ fi
+ if ! test -e "$WINDOWS_SDK_WILANGID" ; then
+ AC_MSG_WARN([WiLangId.vbs not found - building translated packages
will fail])
+ add_warning "WiLangId.vbs not found - building translated packages
will fail"
+ fi
fi
fi
AC_SUBST(WINDOWS_SDK_HOME)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
