generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Yang Tse 2008-07-29 02:26:21 +00:00
parent d785ed2588
commit 52d9a3c34f
6 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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

9
acinclude.m4
View File

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

2
ares/Makefile.am
View File

@ -1,7 +1,5 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libcares.la
man_MANS = $(MANPAGES)

8
ares/acinclude.m4
View File

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

8
ares/buildconf
View File

@ -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}

11
buildconf
View File

@ -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"