diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index bfb878aebb78..5ff6851e860a 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1271,6 +1271,19 @@ def enabled_in_nightly(milestone):
     return milestone.is_nightly
 
 
+# Check if we need the 32-bit Linux SSE2 error dialog
+# ===================================================
+option(
+    env="MOZ_LINUX_32_SSE2_STARTUP_ERROR",
+    help="Add code to perform startup checks to warn if SSE2 is not available",
+    default=depends("MOZ_AUTOMATION")(lambda x: bool(x)),
+    when=target_is_unix & depends(target)(lambda target: target.cpu == "x86"),
+)
+set_config(
+    "MOZ_LINUX_32_SSE2_STARTUP_ERROR", True, when="MOZ_LINUX_32_SSE2_STARTUP_ERROR"
+)
+
+
 # Branding
 # ==============================================================
 option(
diff --git a/build/unix/mozconfig.linux32 b/build/unix/mozconfig.linux32
index 8da778465d97..e43aa13ad99c 100644
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -1,7 +1,5 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
-export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
-
 CFLAGS="$CFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
 CXXFLAGS="$CXXFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
 
diff --git a/old-configure.in b/old-configure.in
index 2b777d017b2b..473b2dbd1d45 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -831,12 +831,6 @@ if test "$COMPILE_ENVIRONMENT"; then
 MOZ_EXPAND_LIBS
 fi # COMPILE_ENVIRONMENT
 
-dnl ========================================================
-dnl Check if we need the 32-bit Linux SSE2 error dialog
-dnl ========================================================
-
-AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
-
 dnl ========================================================
 dnl Check for cairo
 dnl ========================================================