diff --git a/configure b/configure
index e5e08e5020..fb6bd0dd31 100755
--- a/configure
+++ b/configure
@@ -21894,7 +21894,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
+ break
 fi
 
 done
diff --git a/configure.in b/configure.in
index 48442ab925..4ae4fc3e65 100644
--- a/configure.in
+++ b/configure.in
@@ -2104,7 +2104,7 @@ if test "$wxUSE_STL" = "yes"; then
     fi
 fi
 
-AC_CHECK_HEADERS([type_traits tr1/type_traits])
+AC_CHECK_HEADERS([type_traits tr1/type_traits], break)
 
 dnl check for atomic operations builtins for wx/atomic.h:
 WX_ATOMIC_BUILTINS