diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-07-30 03:10:03 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-07-30 03:10:03 +0000 |
| commit | a3498f96efd38849f0ba3063fa91db227999596a (patch) | |
| tree | 8fc759f98e6ae6b62d786b8b86f910983c75f2f5 /ares | |
| parent | 637bfa0252bad8702baaaf03c7511e47cc722b2d (diff) | |
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.
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/Makefile.am | 2 | ||||
| -rw-r--r-- | ares/acinclude.m4 | 9 | ||||
| -rwxr-xr-x | ares/buildconf | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/ares/Makefile.am b/ares/Makefile.am index a9433abdb..04db9ecc9 100644 --- a/ares/Makefile.am +++ b/ares/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS = foreign +ACLOCAL_AMFLAGS = -I m4 + lib_LTLIBRARIES = libcares.la man_MANS = $(MANPAGES) diff --git a/ares/acinclude.m4 b/ares/acinclude.m4 index 13d1b08c4..bdea38447 100644 --- a/ares/acinclude.m4 +++ b/ares/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/ares/buildconf b/ares/buildconf index 364d5a06e..44706ce4f 100755 --- a/ares/buildconf +++ b/ares/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 |