From: Yang Tse <yangsita@gmail.com>
Date: Sun, 27 Jul 2008 18:10:54 +0000 (+0000)
Subject: When calling aclocal, user defined ACLOCAL_FLAGS will now precede ours.
X-Git-Tag: curl-7_19_0~312
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4edc25d01c436a0e1698d1aa169e4bbea673c53;p=thirdparty%2Fcurl.git

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

diff --git a/ares/buildconf b/ares/buildconf
index 434a308fdd..7e5e077b23 100755
--- a/ares/buildconf
+++ b/ares/buildconf
@@ -1,7 +1,12 @@
 #!/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
-ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
 ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
 ${AUTOHEADER:-autoheader}
 ${AUTOCONF:-autoconf}
diff --git a/buildconf b/buildconf
index eecc28f662..578d76ecd0 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"