summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-03 10:22:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-03 10:22:12 +0000
commit853ef28af375b2d8174d757c7d19940670600ccf (patch)
tree94491ce64c9b2057a216e1cfbaafbb616d09b458
parent5cf9b65aa3c1889425fea23ed49d669ecadf6253 (diff)
aclocal.m4: add
* aclocal.m4: add fallback file for non-aclocal environments. [ruby-core:72683] [Bug #11942] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in6
-rw-r--r--aclocal.m415
3 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c039f5..490768e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 3 19:22:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* eval_error.c (rb_print_undef): Use `rb_method_visibility_t`
diff --git a/Makefile.in b/Makefile.in
index e1c6a1c..ff3bd72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,8 +306,10 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
$(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
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..56e944b
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,15 @@
+# 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])