diff --git a/sim/m32r/configure.in b/sim/m32r/configure.in
index 704da3d48f1..0ed1268c187 100644
--- a/sim/m32r/configure.in
+++ b/sim/m32r/configure.in
@@ -15,7 +15,17 @@ SIM_AC_OPTION_SCACHE(1024)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
 SIM_AC_OPTION_ENVIRONMENT
 
-if test ${USE_MAINTAINER_MODE} = yes ; then
+cgen_maint="#"
+# Having --enable-maintainer-mode take arguments is another way to go.
+AC_ARG_ENABLE(cgen-maint,
+[  --enable-cgen-maint     build cgen generated files],
+[case "${enableval}" in
+  yes) cgen_maint="" ;;
+  no)  ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for simulator cgen-maint option]) ;;
+esac])dnl
+AC_SUBST(cgen_maint)
+if test "x${cgen_maint}" = x ; then
     AC_CHECK_PROG(SCHEME, guile, guile, guile)
 fi