Reinstate the 'aclocal -I m4' in buildconf and 'ACLOCAL_AMFLAGS = -I m4' way of

including our local m4/reentrant.m4 file. This even takes care of including the
file in the distribution tarball.

diff --git a/Makefile.am b/Makefile.am
index a9433ab..04db9ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
+ACLOCAL_AMFLAGS = -I m4
+
 lib_LTLIBRARIES = libcares.la
 
 man_MANS = $(MANPAGES)

diff --git a/acinclude.m4 b/acinclude.m4
index 13d1b08..bdea384 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2119,12 +2119,3 @@ AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [
     #
   fi
 ])
-
-dnl Tests done using 'aclocal -I m4' in buildconf and 'ACLOCAL_AMFLAGS = -I m4'
-dnl in top Makefile.am triggered a problem that prevented aclocal from running
-dnl successfully on SunOS 5.10 with GNU m4 1.4.5 and GNU Autoconf 2.61
-dnl We actually don't need all the bells and whistles that the above mechanism
-dnl provides. We only need to include our m4/reentrant.m4 file here.
-
-m4_include([m4/reentrant.m4])
-

diff --git a/buildconf b/buildconf
index 364d5a0..44706ce 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ${LIBTOOLIZE:-libtoolize} --copy --automake --force
-${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
+${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS
 ${AUTOHEADER:-autoheader}
 ${AUTOCONF:-autoconf}
 ${AUTOMAKE:-automake} --add-missing