diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-22 01:27:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-22 01:27:04 +0000 |
commit | 620d3595c7d700f404a42916843a43e5814ff112 (patch) | |
tree | 45c966619369d3603c04125d85313d908a7c54e0 | |
parent | 57cf868b1af639c170359ba94d44c5064435b69d (diff) | |
download | ruby-620d3595c7d700f404a42916843a43e5814ff112.tar.gz |
configure.in: fix RUBY_{APPEND/PREPEND}_OPTION
* configure.in (RUBY_APPEND_OPTION, RUBY_PREPEND_OPTION): expand
the option to be appended/prepended when matching, as well as
RUBY_APPEND_OPTIONS and RUBY_PREPEND_OPTIONS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Oct 22 10:27:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_APPEND_OPTION, RUBY_PREPEND_OPTION): expand + the option to be appended/prepended when matching, as well as + RUBY_APPEND_OPTIONS and RUBY_PREPEND_OPTIONS. + Sat Oct 22 09:52:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (setup_args): duplicate splatting array if more diff --git a/configure.in b/configure.in index 8dd3aa9e66..9d355e1250 100644 --- a/configure.in +++ b/configure.in @@ -311,7 +311,7 @@ AS_IF([test -z "$target_alias" -a -n "$os_version_style_transform"], AC_DEFUN([RUBY_APPEND_OPTION], [# RUBY_APPEND_OPTION($1) AS_CASE([" [$]{$1-} "], - [*' $2 '*], [], [' '], [ $1="$2"], [ $1="[$]$1 $2"])]) + [*" $2 "*], [], [' '], [ $1="$2"], [ $1="[$]$1 $2"])]) AC_DEFUN([RUBY_APPEND_OPTIONS], [# RUBY_APPEND_OPTIONS($1) for rb_opt in $2; do @@ -321,7 +321,7 @@ AC_DEFUN([RUBY_APPEND_OPTIONS], AC_DEFUN([RUBY_PREPEND_OPTION], [# RUBY_PREPEND_OPTION($1) AS_CASE([" [$]{$1-} "], - [*' $2 '*], [], [' '], [ $1="$2"], [ $1="$2 [$]$1"])]) + [*" $2 "*], [], [' '], [ $1="$2"], [ $1="$2 [$]$1"])]) AC_DEFUN([RUBY_PREPEND_OPTIONS], [# RUBY_PREPEND_OPTIONS($1) unset rb_opts; for rb_opt in $2; do |