nobu	2016-01-03 19:22:12 +0900 (Sun, 03 Jan 2016)

  New Revision: 53417

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53417

  Log:
    aclocal.m4: add
    
    * aclocal.m4: add fallback file for non-aclocal environments.
      [ruby-core:72683] [Bug #11942]

  Added files:
    trunk/aclocal.m4
  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 53416)
+++ Makefile.in	(revision 53417)
@@ -306,8 +306,10 @@ reconfig config.status:	$(srcdir)/$(CONF https://github.com/ruby/ruby/blob/trunk/Makefile.in#L306
 $(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
 	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
-$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
-	$(CHDIR) $(srcdir) && exec $(ACLOCAL)
+$(srcdir)/aclocal.m4: $(srcdir)/configure.in
+	$(CHDIR) $(srcdir) && \
+	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
+	touch $(@F)
 
 incs: id.h
 all-incs: probes.h
Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 0)
+++ aclocal.m4	(revision 53417)
@@ -0,0 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/aclocal.m4#L1
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([acinclude.m4])

Property changes on: aclocal.m4
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53416)
+++ ChangeLog	(revision 53417)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Jan  3 19:22:01 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* aclocal.m4: add fallback file for non-aclocal environments.
+	  [ruby-core:72683] [Bug #11942]
+
 Sun Jan  3 13:56:49 2016  Yuichiro Kaneko  <yui-knk@r...>
 
 	* eval_error.c (rb_print_undef): Use `rb_method_visibility_t`

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