Merge branch 'master' into sysroot

This commit is contained in:
Paolo Bonzini 2010-08-22 09:54:55 +02:00
commit 75b9ac5fa2
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2010-08-22 Paolo Bonzini <bonzini@gnu.org>
Fix sed_make_literal_regex.
* libltdl/config/general.m4sh (sed_make_literal_regex): Fix
definition.
2010-08-15 Paolo Bonzini <bonzini@gnu.org> 2010-08-15 Paolo Bonzini <bonzini@gnu.org>
Factor the sed command used to make a regex from a literal. Factor the sed command used to make a regex from a literal.

View File

@ -317,7 +317,7 @@ double_quote_subst='s/\(["`\\]\)/\\\1/g'
# Sed substitution that turns a string into a regex matching for the # Sed substitution that turns a string into a regex matching for the
# string literally. # string literally.
sed_make_literal_regex='s,[].[^$\\*/],\\\\&,g' sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
# Re-`\' parameter expansions in output of double_quote_subst that were # Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$' # `\'-ed in input to the same. If an odd number of `\' preceded a '$'