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

[jan iversen]

 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 75892872496175d71b4ad02c1a477dc9f463d803
Author: jan iversen <jani at documentfoundation.org>
Date:   Sat Nov 28 14:12:17 2015 +0100

    check for missing COMSPEC variable in cygwin.
    
    Cygwin unsets the COMSPEC environment variable on some installations.
    This is due to an error reported first time in 2005, but not solved.
    There are no exact pattern when this happens, in this case it happened
    on 2 windows 8.1 VM installations (one private one azure).
    
    added check in configure.ac to alert the user earlier
    
    COMSPEC is used in sal/osl to start processes and as such vital, and in
    some perl scripts, therefore hardcoding to e.g. cmd32.exe (or the power
    shell) is not an option.
    
    Limited check to work only for cygwin.
    
    Change-Id: I52bb6667c52560ed1a239ac301811605b8cddcbf
    Reviewed-on: https://gerrit.libreoffice.org/20255
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/configure.ac b/configure.ac
index 71f2037..9a13921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,6 +282,10 @@ if test "$build_os" = "cygwin"; then
     PathFormat "$BUILDDIR"
     BUILDDIR="$formatted_path"
     x_Cygwin=
+    AC_MSG_CHECKING(for explicit COMSPEC)
+    if test -z "$COMSPEC"; then
+        AC_MSG_ERROR([COMSPEC not set in Environment, please set it an rerun])
+    fi
 fi
 
 AC_SUBST(SRC_ROOT)