diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 9 | ||||
| -rw-r--r-- | ares/Makefile.am | 2 | ||||
| -rw-r--r-- | ares/acinclude.m4 | 8 | ||||
| -rwxr-xr-x | ares/buildconf | 8 | ||||
| -rwxr-xr-x | buildconf | 11 |
6 files changed, 18 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index bcb42c553..560f8259a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/acinclude.m4 b/acinclude.m4 index cf359d675..250833f72 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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]) + diff --git a/ares/Makefile.am b/ares/Makefile.am index 04db9ecc9..a9433abdb 100644 --- a/ares/Makefile.am +++ b/ares/Makefile.am @@ -1,7 +1,5 @@ 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 18fac9a3e..13d1b08c4 100644 --- a/ares/acinclude.m4 +++ b/ares/acinclude.m4 @@ -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]) + diff --git a/ares/buildconf b/ares/buildconf index bfaf39e87..364d5a06e 100755 --- a/ares/buildconf +++ b/ares/buildconf @@ -1,13 +1,5 @@ #!/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} @@ -253,7 +253,7 @@ if test -d tests/server/.deps; then fi #-------------------------------------------------------------------------- -# Remove files generated in ares subdir on previous buildconf/configure run. +# Remove files generated in c-ares subdir on previous buildconf/configure run. # if test -d ares; then cd ares @@ -290,20 +290,11 @@ fi # run the correct scripts now # -if test -z "$ACLOCAL_FLAGS"; then - ACLOCAL_FLAGS="-I m4" -else - ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" -fi - tmp_host_type=`uname -a | sed '/SunOS/s/.*\(SunOS\).*/\1/'` if test "x$tmp_host_type" = "xSunOS"; then ACLOCAL_FLAGS="$ACLOCAL_FLAGS --verbose" fi -export ACLOCAL_FLAGS -echo "buildconf: using ACLOCAL_FLAGS: $ACLOCAL_FLAGS" - echo "buildconf: running libtoolize" $libtoolize --copy --automake --force || die "The libtoolize command failed" echo "buildconf: running aclocal" |