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

When calling aclocal, user defined ACLOCAL_FLAGS will now precede ours.

Browse Source
This commit is contained in:
Yang Tse 2008-07-27 18:10:54 +00:00
parent 36361d14cf
commit c4edc25d01
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ares/buildconf
View File

@ -1,7 +1,12 @@
#!/bin/sh #!/bin/sh
if test -z "$ACLOCAL_FLAGS"; then
ACLOCAL_FLAGS="-I m4"
else
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
fi
${LIBTOOLIZE:-libtoolize} --copy --automake --force ${LIBTOOLIZE:-libtoolize} --copy --automake --force
ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
${ACLOCAL:-aclocal} $ACLOCAL_FLAGS ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
${AUTOHEADER:-autoheader} ${AUTOHEADER:-autoheader}
${AUTOCONF:-autoconf} ${AUTOCONF:-autoconf}

9
buildconf
View File

@ -206,15 +206,20 @@ PERL=`findtool ${PERL:-perl}`
# run the correct scripts now # 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/'` tmp_host_type=`uname -a | sed '/SunOS/s/.*\(SunOS\).*/\1/'`
if test "x$tmp_host_type" = "xSunOS"; then if test "x$tmp_host_type" = "xSunOS"; then
ACLOCAL_FLAGS="--verbose $ACLOCAL_FLAGS" ACLOCAL_FLAGS="$ACLOCAL_FLAGS --verbose"
fi fi
echo "buildconf: running libtoolize" echo "buildconf: running libtoolize"
$libtoolize --copy --automake --force || die "The libtoolize command failed" $libtoolize --copy --automake --force || die "The libtoolize command failed"
echo "buildconf: running aclocal" echo "buildconf: running aclocal"
ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The aclocal command line failed" ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The aclocal command line failed"
if test -n "$PERL"; then if test -n "$PERL"; then
echo "buildconf: running aclocal hack to convert all mv to mv -f" echo "buildconf: running aclocal hack to convert all mv to mv -f"