[Emacs-diffs] /srv/bzr/emacs/trunk r111719: * configure.ac (emacs_config_options): Strip out the (internal) arguments

[Glenn Morris]

------------------------------------------------------------
revno: 111719
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-02-09 19:37:48 -0800
message:
  * configure.ac (emacs_config_options): Strip out the (internal) arguments
  --no-create and --no-recursion.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-02-08 23:37:17 +0000
+++ b/ChangeLog 2013-02-10 03:37:48 +0000
@@ -1,3 +1,8 @@
+2013-02-10  Glenn Morris  <address@hidden>
+
+       * configure.ac (emacs_config_options): Strip out the (internal)
+       arguments --no-create and --no-recursion.
+
 2013-02-08  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2013-02-07 06:23:54 +0000
+++ b/configure.ac      2013-02-10 03:37:48 +0000
@@ -4087,7 +4087,7 @@
 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/\"/'/g"`
+emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create 
//' -e 's/--no-recursion //' -e 's/ *$//' -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