Commit 52d9a3c3 authored by Yang Tse's avatar Yang Tse
Browse files

Tests done using 'aclocal -I m4' in buildconf and 'ACLOCAL_AMFLAGS = -I m4 

in top Makefile.am triggered a problem that prevented aclocal from running
successfully on SunOS 5.10 with GNU m4 1.4.5 and GNU Autoconf 2.61

A tarball which reproduces mentioned problem is the one dated July-28-2008
http://cool.haxx.se/curl-daily/curl-7.19.0-20080728.tar.gz

We actually don't need all the bells and whistles that the above mechanism
provides. We only need to include our m4/reentrant.m4 file in acinclude.m4
so here we go with this simpler mechanism.
parent d785ed25

Makefile.am

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


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

+9 −0
Original line number Diff line number Diff line
@@ -3530,3 +3530,12 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), 
  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

+0 −2
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

+8 −0
Original line number Diff line number Diff line
@@ -2120,3 +2120,11 @@ 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

+0 −8
Original line number Diff line number Diff line 
#!/bin/sh



if test -z "$ACLOCAL_FLAGS"; then

  ACLOCAL_FLAGS="-I m4"

else

  ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"

fi

export ACLOCAL_FLAGS

echo "cares buildconf: using ACLOCAL_FLAGS: $ACLOCAL_FLAGS"



${LIBTOOLIZE:-libtoolize} --copy --automake --force

${ACLOCAL:-aclocal} $ACLOCAL_FLAGS

${AUTOHEADER:-autoheader}