summaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-07-29 02:26:21 +0000
committerYang Tse <yangsita@gmail.com>2008-07-29 02:26:21 +0000
commit52d9a3c34f4dbc6e9372d87a357efeb7fd6ce1ae (patch)
treeb31d1cdf59e887297c6c2ea2787e4bb7dc5334e5 /buildconf
parentd785ed2588b4bd5cceacec9a59bc5e56b6f30f2d (diff)
downloadcurl-52d9a3c34f4dbc6e9372d87a357efeb7fd6ce1ae.tar.gz
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.
Diffstat (limited to 'buildconf')
-rwxr-xr-xbuildconf11
1 files changed, 1 insertions, 10 deletions
diff --git a/buildconf b/buildconf
index 6bc1e9ed9..8f4a30dd3 100755
--- a/buildconf
+++ b/buildconf
@@ -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"