1. mst
  2. ooo340

Commits

rene  committed cc44e7d

#i10000# fix conflicting elifs for clarity

  • Participants
  • Parent commits 4467d45
  • Branches default

Comments (0)

Files changed (2)

File configure

View file
      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"
 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

File configure.in

View file
      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"