diff --git a/configure1.in b/configure1.in
index dc831bc8469..640d5264918 100755
--- a/configure1.in
+++ b/configure1.in
@@ -147,6 +147,7 @@ done
 ### However, it also turns out that many shells cannot expand ${10} at all.
 ### So using an index variable doesn't work either.  It is possible to use
 ### some shell magic to make 'set x "$arguments"; shift' work portably.
+config_options=
 while [ $# != 0 ]; do
   arg="$1"; shift
   case "${arg}" in
@@ -161,6 +162,7 @@ while [ $# != 0 ]; do
 	  valomitted=no
 	;;
         -*)
+	  config_options="${config_options} ${arg}"
           ## If FOO is a boolean argument, --FOO is equivalent to
           ## --FOO=yes.  Otherwise, the value comes from the next
           ## argument - see below.
@@ -1592,6 +1594,7 @@ AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "\"${configuration}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS,  "\"${config_options}\"")
 AC_DEFINE_UNQUOTED(config_machfile,  "\"${machfile}\"")
 AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})