Move acinclude.m4 inclusion from aclocal.m4 to configure.ac.

aclocal.m4 is autogenerated, so running aclocal would remove the
m4_include of acinclude.m4.

The exceptions are at the top of the source tree and in nsock/src, where
an acinclude.m4 lives; aclocal notices it there and automatically adds
an inclusion to the end of aclocal.m4, so no inclusion is needed in
configure.ac.

ncat/aclocal.m4

@@ -22,5 +22,3 @@
 
 # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
 AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-m4_include([../acinclude.m4])

ncat/configure.ac

@@ -6,6 +6,8 @@ AC_INIT(ncat_main.c)
 
 AM_CONFIG_HEADER(config.h)
 
+m4_include([../acinclude.m4])
+
 AC_CANONICAL_HOST
 
 use_openssl="yes"

nping/aclocal.m4

@@ -10,5 +10,3 @@
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
-
-m4_include([../acinclude.m4])

nping/configure.ac

@@ -7,6 +7,8 @@ sinclude(nbase/configlocal.m4)
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nping.cc)
 
+m4_include([../acinclude.m4])
+
 AC_ARG_WITH(localdirs,
 AC_HELP_STRING([--with-localdirs], [Explicitly ask compiler to use /usr/local/{include,libs} if they exist ]),
   [ case "$with_localdirs" in