diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
| commit | 024e577dc34f1a978dadf4ad82b8ea45fd81de07 (patch) | |
| tree | 6d051c13bb6312adfb3766ad5d3c75a2abea157b /config_office/configure.in | |
| parent | 52bae175c7fc9b95cbb16960335310a0be1e42f6 (diff) | |
CWS-TOOLING: integrate CWS mingwport16
2009-01-15 13:11:20 +0100 releng r266363 : tidy-up tabs
2008-11-28 15:33:23 +0100 tono r264557 : i95203: mingw build without stlport
2008-11-22 07:19:50 +0100 tono r264180 : i96436: make mingw bridge conform with reg-struct-return
2008-11-22 05:14:58 +0100 tono r264179 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 17:09:04 +0100 tono r264153 : i95203: mingw build without stlport
2008-11-21 16:59:55 +0100 tono r264152 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:59:18 +0100 tono r264151 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:57:01 +0100 tono r264150 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:53:19 +0100 tono r264149 : i96100: mingw port for icu 4.0
2008-11-13 13:41:13 +0100 tono r263643 : i95203: mingw: Build without stlport
2008-11-13 13:29:38 +0100 tono r263640 : i96100: MinGW port for icu 4.0
2008-11-13 13:17:10 +0100 tono r263634 : i96098: MinGW port fix for new Windows API
2008-11-09 15:22:59 +0100 tono r263497 : i95198: mingwport do not interfere with Cygwin
2008-11-09 14:44:54 +0100 tono r263496 : i95190: mingwport avoid use of MS assembler
2008-11-09 14:32:26 +0100 tono r263495 : i95190: mingwport trivial build fixes
Diffstat (limited to 'config_office/configure.in')
| -rw-r--r-- | config_office/configure.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 49318a093dcc..2f67a5357e94 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -2304,6 +2304,8 @@ dnl =================================================================== esac elif test "$_os" = "Darwin"; then DEFAULT_TO_STLPORT="no" + elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" = "yes"; then + DEFAULT_TO_STLPORT="no" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then AC_MSG_RESULT([stlport]) @@ -4937,7 +4939,7 @@ AC_SUBST(CYGWIN_PATH) dnl *************************************** dnl testing ml.exe assembler path dnl *************************************** -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then AC_MSG_CHECKING([ml.exe assembler path]) if test -n "$with_asm_home"; then with_asm_home=`cygpath -u "$with_asm_home"` |