diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | ares/Makefile.am | 2 | ||||
| -rw-r--r-- | ares/acinclude.m4 | 9 | ||||
| -rwxr-xr-x | ares/buildconf | 2 | ||||
| -rwxr-xr-x | buildconf | 36 |
6 files changed, 6 insertions, 55 deletions
diff --git a/Makefile.am b/Makefile.am index 560f8259a..bcb42c553 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/acinclude.m4 b/acinclude.m4 index 250833f72..2bf8f1041 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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]) - 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 @@ -305,46 +305,12 @@ fi tmp_host_type=`uname -a | sed '/SunOS/s/.*\(SunOS\).*/\1/'` if test "x$tmp_host_type" = "xSunOS"; then ACLOCAL_FLAGS="$ACLOCAL_FLAGS --verbose" - - echo "buildconf: PATH: $PATH" - - # show all available sed's in PATH order - old_IFS=$IFS; IFS=':' - for path in $PATH - do - IFS=$old_IFS - if test -f "$path/sed"; then - echo "buildconf: sed: $path/sed" - fi - if test -f "$path/gsed"; then - echo "buildconf: sed: $path/gsed" - if test -z "$SED"; then - SED="$path/gsed" - export SED - fi - fi - done - IFS=$old_IFS - echo "buildconf: SED: $SED" - - echo "buildconf: Feeding acinclude.m4 with reentrant.m4" - - sed 's/m4_include.*m4.*reentrant.m4.*//' acinclude.m4 > acinclude.2 - mv acinclude.2 acinclude.m4 - cat m4/reentrant.m4 >> acinclude.m4 - rm -f m4/reentrant.m4 - - sed 's/m4_include.*m4.*reentrant.m4.*//' ares/acinclude.m4 > ares/acinclude.2 - mv ares/acinclude.2 ares/acinclude.m4 - cat ares/m4/reentrant.m4 >> ares/acinclude.m4 - rm -f ares/m4/reentrant.m4 - fi echo "buildconf: running libtoolize" $libtoolize --copy --automake --force || die "The libtoolize command failed" echo "buildconf: running aclocal" -${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The aclocal command line failed" +${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS || die "The aclocal command line failed" if test -n "$PERL"; then echo "buildconf: running aclocal hack to convert all mv to mv -f" $PERL -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4 |