diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-27 05:56:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-27 05:56:24 +0000 |
| commit | 1b4e1375374c37d092d069b887fca61e53701ad8 (patch) | |
| tree | 813fce60d4a05ca5fc610b0dfd8d4a354728f473 /configure.in | |
| parent | 9598856e868be10661ac5aff827ef39f14e2aa2d (diff) | |
* configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/configure.in b/configure.in index f434d9be15..4f1a74e935 100644 --- a/configure.in +++ b/configure.in @@ -797,15 +797,9 @@ if test "$rb_cv_va_args_macro" = yes; then fi AC_DEFUN([RUBY_DEFINE_IF], [dnl - m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h -@%:@if $1 -EOH -])dnl -AC_DEFINE_UNQUOTED($2, $3) - m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h -@%:@endif /* $1 */ -EOH -])dnl + m4_ifval([$1],[test "$1" && AS_ECHO("@%:@if $1") >> confdefs.h]) +AC_DEFINE_UNQUOTED($2, $3)dnl + m4_ifval([$1],[test "$1" && AS_ECHO("@%:@endif /* $1 */") >> confdefs.h]) ])dnl dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition) @@ -818,7 +812,7 @@ m4_ifval([$3], dnl [AS_VAR_PUSHDEF([rbcv],[$3])], dnl [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl )dnl -m4_ifval([$4], [rbcv_cond=[$4]; test "$rbcv_cond" || unset rbcv_cond]) +m4_ifval([$4], [rbcv_cond=["$4"]; test "$rbcv_cond" || unset rbcv_cond]) AC_CACHE_CHECK(for [$1] function attribute, rbcv, [rbcv=x RUBY_WERROR_FLAG([ @@ -835,10 +829,11 @@ ${rbcv_cond+[@%:@endif]}) done ])]) if test "$rbcv" != x; then - RUBY_DEFINE_IF([${rbcv_cond}], attrib[(x)], $rbcv) + RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[(x)], $rbcv) fi -AS_VAR_POPDEF([attrib]) -AS_VAR_POPDEF([rbcv]) +m4_ifval([$4], [unset rbcv_cond])dnl +AS_VAR_POPDEF([attrib])dnl +AS_VAR_POPDEF([rbcv])dnl ]) RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN) |