aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2013-08-14 12:31:41 +0200
committerJoakim Verona2013-08-14 12:31:41 +0200
commit2d22a50de5de4dd7a952cb0ae7e7db7ee82a8a7d (patch)
tree74eadb959d7fa550f667db9267566d6e3f59a522
parent072a48a94b57625678e2e7e24a3d9464e3b0cb60 (diff)
parent1ee025605e24c0cd99acc5af5c16412ff6ae2cd3 (diff)
downloademacs-2d22a50de5de4dd7a952cb0ae7e7db7ee82a8a7d.tar.gz
emacs-2d22a50de5de4dd7a952cb0ae7e7db7ee82a8a7d.zip
merge from trunk
-rwxr-xr-xautogen/configure2
1 files changed, 1 insertions, 1 deletions
diff --git a/autogen/configure b/autogen/configure
index 45d5b7954c9..cde9f41c440 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -17169,7 +17169,7 @@ cat >>confdefs.h <<_ACEOF
17169#define EMACS_CONFIGURATION "${canonical}" 17169#define EMACS_CONFIGURATION "${canonical}"
17170_ACEOF 17170_ACEOF
17171 17171
17172emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"` 17172emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g" -e 's/\\\\/\\\\\\\\/g'`
17173 17173
17174cat >>confdefs.h <<_ACEOF 17174cat >>confdefs.h <<_ACEOF
17175#define EMACS_CONFIG_OPTIONS "${emacs_config_options}" 17175#define EMACS_CONFIG_OPTIONS "${emacs_config_options}"