[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit a084ea60680372efb7998f7369c9fc99eb85c50a
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 31 12:41:31 2012 +0100

    do not second-guess the location of mingw sysroot
    
    Change-Id: I669b6c7b90f2b803f68df86704b357967481f6ce

diff --git a/configure.ac b/configure.ac
index c74e1a2..8428abc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5313,12 +5313,13 @@ dnl ===================================================================
 dnl Set the MinGW sys-root
 dnl ===================================================================
 if test "$WITH_MINGW" = "yes"; then
-    for sysroot in /usr/i686-w64-mingw32/sys-root/mingw; do
-        if test -d "$sysroot"; then
-            MINGW_SYSROOT="$sysroot"
-            break
-        fi
-    done
+    AC_MSG_CHECKING([for MinGW sysroot])
+    sysroot=`$CC -print-sysroot`
+    AS_IF([test -d "$sysroot"],
+          [MINGW_SYSROOT="$sysroot"
+           AC_MSG_RESULT([$MINGW_SYSROOT])],
+          [AC_MSG_RESULT([not found])
+           AC_MSG_ERROR([cannot determine MinGW sysroot])])
 fi
 AC_SUBST([MINGW_SYSROOT])