1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2011-10-27 05:56:24 +00:00
parent 9598856e86
commit 1b4e137537
2 changed files with 11 additions and 14 deletions

View file

@ -1,4 +1,6 @@
Thu Oct 27 14:55:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Oct 27 14:56:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable.
* configure.in (RUBY_STACK_GROW_DIRECTION): substitute CPU name as * configure.in (RUBY_STACK_GROW_DIRECTION): substitute CPU name as
shell variable name. based on the patch by The Written Word Inc. at shell variable name. based on the patch by The Written Word Inc. at

View file

@ -797,15 +797,9 @@ if test "$rb_cv_va_args_macro" = yes; then
fi fi
AC_DEFUN([RUBY_DEFINE_IF], [dnl AC_DEFUN([RUBY_DEFINE_IF], [dnl
m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h m4_ifval([$1],[test "$1" && AS_ECHO("@%:@if $1") >> confdefs.h])
@%:@if $1 AC_DEFINE_UNQUOTED($2, $3)dnl
EOH m4_ifval([$1],[test "$1" && AS_ECHO("@%:@endif /* $1 */") >> confdefs.h])
])dnl
AC_DEFINE_UNQUOTED($2, $3)
m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
@%:@endif /* $1 */
EOH
])dnl
])dnl ])dnl
dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition) 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],[$3])], dnl
[AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
)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, AC_CACHE_CHECK(for [$1] function attribute, rbcv,
[rbcv=x [rbcv=x
RUBY_WERROR_FLAG([ RUBY_WERROR_FLAG([
@ -835,10 +829,11 @@ ${rbcv_cond+[@%:@endif]})
done done
])]) ])])
if test "$rbcv" != x; then 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 fi
AS_VAR_POPDEF([attrib]) m4_ifval([$4], [unset rbcv_cond])dnl
AS_VAR_POPDEF([rbcv]) AS_VAR_POPDEF([attrib])dnl
AS_VAR_POPDEF([rbcv])dnl
]) ])
RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN) RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)