summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Engelhard <rene@openoffice.org>2009-01-21 22:15:49 +0000
committerRené Engelhard <rene@openoffice.org>2009-01-21 22:15:49 +0000
commitbd7b1b3afbf15bd23a75d382f3118901809a9059 (patch)
tree276860d679e5feb72aded06af559a32733dd8b8f
parent7002ca856ae12e83e1f05391476f897168e778c9 (diff)
#i10000# fix conflicting elifs for clarity
-rwxr-xr-xconfigure6
-rw-r--r--configure.in6
2 files changed, 7 insertions, 5 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
diff --git a/configure.in b/configure.in
index ee4929fbe23a..a3f3f285b175 100644
--- a/configure.in
+++ b/configure.in
@@ -2315,9 +2315,9 @@ dnl ===================================================================
esac
elif test "$_os" = "SunOS"; then
DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" = "yes"; then
- DEFAULT_TO_STLPORT="no"
- 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"