nobu	2011-10-27 14:56:24 +0900 (Thu, 27 Oct 2011)

  New Revision: 33534

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33534

  Log:
    * configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 33533)
+++ configure.in	(revision 33534)
@@ -797,16 +797,10 @@
 fi
 
 AC_DEFUN([RUBY_DEFINE_IF], [dnl
-    m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
-@%:@if $1
-EOH
+    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
-AC_DEFINE_UNQUOTED($2, $3)
-    m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
-@%:@endif /* $1 */
-EOH
-])dnl
-])dnl
 
 dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
 AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
@@ -818,7 +812,7 @@
   [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 @@
 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)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33533)
+++ ChangeLog	(revision 33534)
@@ -1,5 +1,7 @@
-Thu Oct 27 14:55:27 2011  Nobuyoshi Nakada  <nobu@r...>
+Thu Oct 27 14:56:22 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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
 	  [ruby-core:40421].  [Bug #5488]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/