diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | aclocal.m4 | 15 |
3 files changed, 24 insertions, 2 deletions
@@ -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 e1c6a1cc12..ff3bd728f8 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 0000000000..56e944be8f --- /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]) |