[Libreoffice-commits] .: 2 commits - configure.in

[Tor Lillqvist]

 configure.in |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 232f50157e6aa54e03ad4c45ba8c5a8a4805fb0a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Dec 20 15:20:56 2010 +0200

    No system Mesa headers on Win32
    
    No OpenGL, included or "system", used by LO at all on Win32 as far, as
    I know, but let's just pass --without-system-mesa-headers to the inner
    configure for now so that it won't look for them.

diff --git a/configure.in b/configure.in
index ce088a1..96508a7 100755
--- a/configure.in
+++ b/configure.in
@@ -684,10 +684,10 @@ fi
 # it's a really bad idea to do conditional tests for things.
 #
 if test "z`uname -s`" != "zSunOS" -a "z$with_win32" = "z" -a \( "z`uname -o 2>/dev/null`" = "zCygwin" -o "z`uname -s`" = "zInterix" \) ; then
-    AC_MSG_WARN([Automatically using --with-win32 --disable-build-mozilla])
+    AC_MSG_WARN([Automatically using --with-win32 --disable-build-mozilla --without-system-mesa-headers])
     with_win32="yes"
     enable_binfilter="yes"
-    PROPAGATED_ARGS="$PROPAGATED_ARGS --disable-build-mozilla"
+    PROPAGATED_ARGS="$PROPAGATED_ARGS --disable-build-mozilla --without-system-mesa-headers"
 fi
 if test "z$with_win32" = "z"; then
     if test "$have_common" = "false" ; then
commit 9621a03c4a47e45c7f6bd5a2df7e566e3ea4bbdf
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Dec 20 15:09:47 2010 +0200

    It's called MinGW, not mingwin, mingw32, etc

diff --git a/configure.in b/configure.in
index 60d864d..ce088a1 100755
--- a/configure.in
+++ b/configure.in
@@ -388,17 +388,17 @@ AC_ARG_WITH(max-jobs,
                           same time. Defaults to 1.],
 ,)
 
-AC_ARG_WITH(mingwin,
+AC_ARG_WITH(mingw,
 [
-  --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment, this implies --with-use-shell=tcsh
+  --with-mingw            For Windows users, use the MinGW compiler within
+                          a Cygwin environment
 
-                          Usage:     --with-mingwin=yes
+                          Usage:     --with-mingw=yes
 
-                          For not Windows use, use the mingw32 C++ compiler to
+                          Otherwise, use the MinGW C++ compiler to
                           (re-)build unowinreg.dll.
 
-                          Usage:     --with-mingwin=i586-mingw32msvc-g++],
+                          Usage:     --with-mingw=i586-mingw32msvc-g++],
 ,)
 
 AC_ARG_WITH(mirror,