[Libreoffice-commits] .: 2 commits - configure.ac oowintool

[Libreoffice Gerrit user]

 configure.ac |    2 +-
 oowintool    |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 85b7df9800d8aded628a424ec7e19220a2967966
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 2 15:22:37 2012 +0200

    Bin help for nonexistent switch --msvc-find-msms-vc100
    
    Change-Id: I14fb49acdbd242c0e68957ec72cba558df273c4a

diff --git a/oowintool b/oowintool
index c81d81f..f32113d 100755
--- a/oowintool
+++ b/oowintool
@@ -47,8 +47,6 @@ sub print_syntax()
     print " commands:\n";
     print "   --msvc-ver              - print version of MSVC eg. 6.0\n";
     print "   --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
-    print "   --msvc-find-msms-vc100  - exit with 0 if Microsoft_VC100_CRT_x86.msm\n";
-    print "                             is available\n";
     print "   --msvc-copy-msms <dest> - copy mscrt merge modules to <dest>/msm90/\n";
     print "   --msvc-copy-msms-64 <ds>- copy the x64 mscrt merge modules to <ds>/msm90/\n";
     print "   --msvc-productdir       - print productdir\n";
commit 6474d8cb2e9d3a890a10593b4d6213f6895026e8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 2 12:46:25 2012 +0200

    There is no --with-zip-home option
    
    Change-Id: I560b4504263c824154f488aab2fa62c1d26e03bb

diff --git a/configure.ac b/configure.ac
index e1598e7..9a9689a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9347,7 +9347,7 @@ dnl ===================================================================
 AC_PATH_PROG(ZIP, zip)
 test -z "$ZIP" && AC_MSG_ERROR([zip is required])
 if ! "$ZIP" --filesync < /dev/null 2>/dev/null > /dev/null; then
-    AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
+    AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install it and make sure it is the one found first in PATH],,)
 fi
 
 AC_PATH_PROG(UNZIP, unzip)