diff --git a/configure b/configure
index d8b3eda13d..09fc5379fe 100755
--- a/configure
+++ b/configure
@@ -1787,6 +1787,16 @@ EOF
       esac
     fi
 
+    if test $_cmov = "yes" && test $_fast_cmov = "auto" ; then
+        _fast_cmov="yes"
+        case "$proc" in
+            pentium4|prescott|nocona)
+                _fast_cmov="no"
+        esac
+    else
+        _fast_cmov="no"
+    fi
+
     echores "$proc"
     ;;
 
@@ -1973,17 +1983,6 @@ EOF
         echores "$proc"
     fi
 
-    #FIXME: The runtime CPU detection could check this as well.
-    if test _cmov = "yes" && test _fast_cmov = "auto" ; then
-        _fast_cmov="yes"
-        case "$proc" in
-            pentium4|prescott|nocona)
-                _fast_cmov="no"
-        esac
-    else
-        _fast_cmov="no"
-    fi
-
     echocheck "GCC & CPU optimization abilities"
 
     if test -n "$proc"; then