maint: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS.

Also arrange order of directories so that am__aclocal_m4_deps
in Makefile.in is generated the same by ./bootstrap and
autoreconf.  The latter is invoked by 'make release' (via the
_version rule in GNUmakefile) to change the version number.
We want am__aclocal_m4_deps to be identical so that the
"make dist" and "make release" tarballs are identical.

* Makefile.am (ACLOCAL_AMFLAGS): Remove.
configure.ac (AC_CONFIG_MACRO_DIRS): Add.
bootstrap.conf (ACLOCAL_AMFLAGS): Remove.

Makefile.am

@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-ACLOCAL_AMFLAGS = -I am -I m4
-
 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2
 EXTRA_DIST += paths summary.sh.in CHECKLIST
 

bootstrap.conf

@@ -32,8 +32,6 @@ xz	   -
 
 checkout_only_file=README-alpha
 
-ACLOCAL_FLAGS="-I am -I m4"
-
 # gnulib library name
 gnulib_name=libgnu
 

configure.ac

@@ -22,6 +22,7 @@ AC_INIT([GNU inetutils],
  m4_esyscmd([build-aux/git-version-gen .tarball-version]),
  [bug-inetutils@gnu.org])
 
+AC_CONFIG_MACRO_DIRS([m4 am])
 AC_CONFIG_SRCDIR([src/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h:config.hin])