Subject: bug#15726: [PATCH] maint: avoid automake deprecation warning re ACLOCAL_AMFLAGS

From: Jim Meyering <[email-masked]>
Date: Sat, 26 Oct 2013 20:37:30 -0700

Running automake, I saw a deprecation warning concerning ACLOCAL_AMFLAGS.
This patch avoids it and increases the requirement to automake-1.12:
From bc9c23a4350598db4ec04225e1e0194a7b17175d Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email-masked]>
Date: Sat, 26 Oct 2013 18:34:03 -0700
Subject: [PATCH] maint: avoid automake deprecation warning re
 ACLOCAL_AMFLAGS

* Makefile.am (ACLOCAL_AMFLAGS): Don't use this deprecated variable.
* configure.ac (AC_CONFIG_MACRO_DIRS): Use this instead.
(AUTOMAKE_OPTIONS): Require automake-1.12.
---
 Makefile.am  | 3 +--
 configure.ac | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d2ba6e6..8090826 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-AUTOMAKE_OPTIONS = gnu 1.10
-ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = gnu 1.12

 SUBDIRS = po lib doc src tests gnulib-tests

diff --git a/configure.ac b/configure.ac
index 1ebc253..b8d55af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR(src/grep.c)
 AC_DEFINE([GREP], 1, [We are building grep])
 AC_PREREQ(2.59)
+AC_CONFIG_MACRO_DIRS([m4])

 dnl Automake stuff.
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz color-tests parallel-tests
--
1.8.4.1.600.g3d092bf