merge from trunk

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c0b7d967113..23e4b038663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-14  Ulrich Müller  <ulm@gentoo.org>
+
+        * configure.ac (EMACS_CONFIGURATION): Escape backslashes.  (Bug#15091)
+
 2013-08-12  Eli Zaretskii  <eliz@gnu.org>
 
         * configure.ac (HAVE_ZLIB): Don't use -lz on MinGW.
diff --git a/configure.ac b/configure.ac
index cae27025311..9c6a5bdfadf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4478,7 +4478,7 @@ fi
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                    [Define to the canonical Emacs configuration name.])
 dnl Replace any embedded " characters (bug#13274).
-emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
+emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g" -e 's/\\\\/\\\\\\\\/g'`
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
                    [Define to the options passed to configure.])
 AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure