From 60f5e585bd5a94ddce429a5271640293afa53089 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 27 Dec 2012 09:59:21 -0800 Subject: [PATCH] configure.ac fix for double quotes in configure command-line * configure.ac (emacs_config_options): New. Use $@ rather than undocumented $ac_configure_args. Replace any embedded double quotes. Fixes: debbugs:13274 --- ChangeLog | 6 ++++++ configure.ac | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1a68ed5e954..9623763b950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-12-27 Glenn Morris + + * configure.ac (emacs_config_options): New. + Use $@ rather than undocumented $ac_configure_args. + Replace any embedded double quotes. (Bug#13274) + 2012-12-27 Andreas Schwab * configure.ac (SIGNALS_VIA_CHARACTERS): Also define for darwin. diff --git a/configure.ac b/configure.ac index 9e0582dee6b..429443c2c24 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,9 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) AC_INIT(emacs, 24.3.50) +dnl This is the documented way to record the args passed to configure, +dnl rather than $ac_configure_args. +emacs_config_options="$@" AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) AC_CONFIG_AUX_DIR(build-aux) @@ -4068,7 +4071,9 @@ fi AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", [Define to the canonical Emacs configuration name.]) -AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", +dnl Replace any embedded " characters (bug#13274). +emacs_config_options=`echo "$emacs_config_options" | sed -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 define this to include extra configuration information.]) -- 2.39.5