diff --git a/configure b/configure
index 89b8bc51bfefd2be1144292e455838b2814693d1..1da3152fc86b2e9488bc2de6267dc1b1caaffbd2 100755
--- a/configure
+++ b/configure
@@ -2722,11 +2722,15 @@ fi
 LINKER="${CXX}"
 POSTBUILD=""
 
-if test "x$enable_cygwin" = "xno"; then
-  UNAME="${UNAME}-no-cygwin"
-  CC="${CC} -mno-cygwin"
-  CXX="${CXX} -mno-cygwin"
-  LINKER="${LINKER} -mno-cygwin"
+case "$UNAME" in
+  CYGWIN*)
+    if test "x$enable_cygwin" = "xno"; then
+      UNAME="${UNAME}-no-cygwin"
+      CC="${CC} -mno-cygwin"
+      CXX="${CXX} -mno-cygwin"
+      LINKER="${LINKER} -mno-cygwin"
+    fi
+    ;;
 fi
 
 FLAGS=""
diff --git a/configure.in b/configure.in
index 6f7c007bda7ccbd3fe794682181dcce66e45bbe7..b9e4df220a223af22eaf5e6d2ebf77d000223569 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.88 2006-02-24 22:07:05 geuzaine Exp $
+dnl $Id: configure.in,v 1.89 2006-02-25 02:50:23 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 dnl
@@ -106,12 +106,16 @@ fi
 LINKER="${CXX}"
 POSTBUILD=""
 
-dnl Specify -mno-cygwin as soon as possible
-if test "x$enable_cygwin" = "xno"; then
-  UNAME="${UNAME}-no-cygwin"
-  CC="${CC} -mno-cygwin"
-  CXX="${CXX} -mno-cygwin"
-  LINKER="${LINKER} -mno-cygwin"
+dnl Take care of no-cygwin option before doing any other tests
+case "$UNAME" in
+  CYGWIN*)
+    if test "x$enable_cygwin" = "xno"; then
+      UNAME="${UNAME}-no-cygwin"
+      CC="${CC} -mno-cygwin"
+      CXX="${CXX} -mno-cygwin"
+      LINKER="${LINKER} -mno-cygwin"
+    fi
+    ;;
 fi
 
 dnl Set default flags