diff --git a/configure b/configure
index 54efb2c1ac..1c6efb4ea7 100755
--- a/configure
+++ b/configure
@@ -566,8 +566,6 @@ CONFIG_LIST='
     bktr
     dc1394
     dv1394
-    ebp_available
-    ebx_available
     ffmpeg
     ffplay
     ffserver
@@ -626,6 +624,8 @@ HAVE_LIST="
     dev_video_bktr_ioctl_bt848_h
     dlfcn_h
     dlopen
+    ebp_available
+    ebx_available
     fast_64bit
     fast_cmov
     freetype2
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index 67d4cd9aa5..ebd60ff7f4 100644
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86_cpu.h
@@ -57,7 +57,7 @@
 #  define REGSP   esp
 #endif
 
-#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && defined(CONFIG_EBX_AVAILABLE) && defined(CONFIG_EBP_AVAILABLE))
+#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && defined(HAVE_EBX_AVAILABLE) && defined(HAVE_EBP_AVAILABLE))
 #  define CONFIG_7REGS 1
 #endif