Commit a3498f96 authored by Yang Tse's avatar Yang Tse
Browse files

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.
parent 637bfa02

Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


AUTOMAKE_OPTIONS = foreign



ACLOCAL_AMFLAGS = -I m4



EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist curl-config.in \

 curl-style.el sample.emacs RELEASE-NOTES buildconf buildconf.bat libcurl.pc.in

acinclude.m4

+0 −10
Original line number Diff line number Diff line
@@ -3529,13 +3529,3 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), 
    AC_MSG_RESULT([no])

  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])

ares/Makefile.am

+2 −0
Original line number Diff line number Diff line 
AUTOMAKE_OPTIONS = foreign



ACLOCAL_AMFLAGS = -I m4



lib_LTLIBRARIES = libcares.la



man_MANS = $(MANPAGES)

ares/acinclude.m4

+0 −9
Original line number Diff line number Diff line
@@ -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])

ares/buildconf

+1 −1
Original line number Diff line number Diff line 
#!/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