From c1de5660711505d9f381d562596b3b06407766e1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 27 Oct 2011 09:28:21 +0000
Subject: * configure.in (RUBY_DEFINE_IF): revert r33534 partially to get   rid
 of AS_ECHO which is not available in autoconf 2.61.   [ruby-dev:44702]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  6 ++++++
 configure.in | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0997ea62a9..bbb81b8560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 27 18:28:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_DEFINE_IF): revert r33534 partially to get
+	  rid of AS_ECHO which is not available in autoconf 2.61.
+	  [ruby-dev:44702]
+
 Thu Oct 27 16:10:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is
diff --git a/configure.in b/configure.in
index 4f1a74e935..cd055da3d6 100644
--- a/configure.in
+++ b/configure.in
@@ -797,9 +797,15 @@ if test "$rb_cv_va_args_macro" = yes; then
 fi
 
 AC_DEFUN([RUBY_DEFINE_IF], [dnl
-    m4_ifval([$1],[test "$1" && AS_ECHO("@%:@if $1") >> confdefs.h])
+    m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
+@%:@if $1
+EOH
+])dnl
 AC_DEFINE_UNQUOTED($2, $3)dnl
-    m4_ifval([$1],[test "$1" && AS_ECHO("@%:@endif /* $1 */") >> confdefs.h])
+    m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
+@%:@endif /* $1 */
+EOH
+])dnl
 ])dnl
 
 dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
-- 
cgit v1.2.3