From 1b4e1375374c37d092d069b887fca61e53701ad8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 27 Oct 2011 05:56:24 +0000
Subject: [PATCH] * 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
---
 ChangeLog    |  4 +++-
 configure.in | 21 ++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fe52f3d06..ea24306483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 	  shell variable name.  based on the patch by The Written Word Inc. at
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)