diff options
| author | René Engelhard <rene@openoffice.org> | 2009-01-21 22:15:49 +0000 |
|---|---|---|
| committer | René Engelhard <rene@openoffice.org> | 2009-01-21 22:15:49 +0000 |
| commit | bd7b1b3afbf15bd23a75d382f3118901809a9059 (patch) | |
| tree | 276860d679e5feb72aded06af559a32733dd8b8f /configure | |
| parent | 7002ca856ae12e83e1f05391476f897168e778c9 (diff) | |
#i10000# fix conflicting elifs for clarity
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure index c39a3e16512a..eefd4c57e2ce 100755 --- a/configure +++ b/configure @@ -10375,7 +10375,9 @@ echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6; } esac elif test "$_os" = "SunOS"; then DEFAULT_TO_STLPORT="yes" - elif test "$_os" = "WINNT" -o "$_os" = "OS2"; then + elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then + DEFAULT_TO_STLPORT="yes" + elif test "$_os" = "OS2"; then DEFAULT_TO_STLPORT="yes" elif test "$_os" = "FreeBSD"; then DEFAULT_TO_STLPORT="yes" @@ -23735,7 +23737,7 @@ if test -z "$CYGWIN_PATH"; then fi -if test "$_os" = "WINNT"; then +if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then { echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6; } if test -n "$with_asm_home"; then |