[gnumeric] win32: check spelling variant for mingw.

[Morten Welinder <mortenw src gnome org>]

commit 0f1998c36daea929c7009d1c0c03b031a4401a69
Author: Morten Welinder <terra gnome org>
Date:   Mon Apr 12 21:03:36 2010 -0400

    win32: check spelling variant for mingw.

 tools/ChangeLog          |    3 +++
 tools/win32/jhbuildrc.py |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 1915231..4c2d0d6 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-12  Morten Welinder  <terra gnome org>
 
+	* win32/jhbuildrc.py: Check for alternate mingw_tool_prefix.
+	Disable perl for Gnumeric.
+
 	* win32/build: Install COPYING (as a link).
 
 2010-04-06  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index cd65630..28a50d5 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -30,6 +30,10 @@ addpath('PKG_CONFIG_PATH', os.path.join(os.sep, prefix, 'share', 'pkgconfig'))
 
 #Prefix for all the tools
 mingw_tool_prefix = '/usr/bin/i586-mingw32msvc-'
+if os.path.exists(mingw_tool_prefix + 'gcc'):
+    # Nothing
+else:
+    mingw_tool_prefix = '/usr/bin/i686-pc-mingw32-'
 
 mingw_tools = {'ADDR2LINE': 'addr2line',
 	'AS': 'as', 'CC': 'gcc', 'CPP': 'cpp',
@@ -147,6 +151,6 @@ module_autogenargs['libglade']	= autogenargs
 module_autogenargs['pygobject']	= autogenargs + """ --without-ffi --without-gio-unix"""
 module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
 module_autogenargs['goffice']	= autogenargs + """ --without-gconf --with-gmathml"""
-module_autogenargs['gnumeric']	= autogenargs + """ --disable-component"""
+module_autogenargs['gnumeric']	= autogenargs + """ --disable-component --without-perl"""
 module_autogenargs['poppler']	= autogenargs + """ --disable-cms"""
 module_autogenargs['evince']	= autogenargs + """ --without-gconf --without-keyring"""