aboutsummaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-07-27 18:10:54 +0000
committerYang Tse <yangsita@gmail.com>2008-07-27 18:10:54 +0000
commitc4edc25d01c436a0e1698d1aa169e4bbea673c53 (patch)
tree2d8aa5f1c20bdfd658ee24c6cf8c7686352b7a72 /buildconf
parent36361d14cf0637f45ca6e6f1e34f95d74d3d0322 (diff)
When calling aclocal, user defined ACLOCAL_FLAGS will now precede ours.
Diffstat (limited to 'buildconf')
-rwxr-xr-xbuildconf9
1 files changed, 7 insertions, 2 deletions
diff --git a/buildconf b/buildconf
index eecc28f66..578d76ecd 100755
--- a/buildconf
+++ b/buildconf
@@ -206,15 +206,20 @@ PERL=`findtool ${PERL:-perl}`
# 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="--verbose $ACLOCAL_FLAGS"
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS --verbose"
fi
echo "buildconf: running libtoolize"
$libtoolize --copy --automake --force || die "The libtoolize command failed"
echo "buildconf: running aclocal"
-ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
${ACLOCAL:-aclocal} $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"