nobu	2013-04-25 02:23:36 +0900 (Thu, 25 Apr 2013)

  New Revision: 40454

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

  Log:
    configure.in: RUBY_RM_RECURSIVE
    
    * configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
      autoconf 2.69 or earlier on darwin.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 40453)
+++ configure.in	(revision 40454)
@@ -11,10 +11,13 @@ AC_DEFUN([RUBY_PREREQ_AC], https://github.com/ruby/ruby/blob/trunk/configure.in#L11
 
 AC_DISABLE_OPTION_CHECKING
 
+AC_DEFUN([RUBY_RM_RECURSIVE], [
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
 # suppress error messages, rm: cannot remove 'conftest.dSYM', from
 # AC_EGREP_CPP with CFLAGS=-g on Darwin.
 #
 # TODO: remove this hack when AC_PREREQ() becomes 2.70 or later.
+AS_CASE([$build_os], [darwin*], [
 rm() {
     rm_recursive=''
     for arg do
@@ -24,8 +27,9 @@ rm() { https://github.com/ruby/ruby/blob/trunk/configure.in#L27
 		[conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
 		[])
     done
-    command rm $rm_recursive "$@"
+    command rm $rm_recursive "[$]@"
 }
+])])])
 
 { # environment section
 
@@ -194,6 +198,7 @@ RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY https://github.com/ruby/ruby/blob/trunk/configure.in#L198
 AC_DEFINE(CANONICALIZATION_FOR_MATHN)
 dnl checks for alternative programs
 AC_CANONICAL_BUILD
+RUBY_RM_RECURSIVE
 AC_ARG_WITH(gcc,
 	AS_HELP_STRING([--without-gcc], [never use gcc]),
 	[
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40453)
+++ ChangeLog	(revision 40454)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Apr 25 02:23:28 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
+	  autoconf 2.69 or earlier on darwin.
+
 Thu Apr 25 01:22:41 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/tracer.rb (get_line): simply read by File.readlines.

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