diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 14 insertions, 2 deletions
@@ -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) |