You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/12/03 01:39:47 UTC
git commit: Fixed ./bootstrap to handle AUTOMAKE and ACLOCAL
environment variables.
Updated Branches:
refs/heads/master 48d7f62d6 -> bfb16a2e1
Fixed ./bootstrap to handle AUTOMAKE and ACLOCAL environment
variables.
See: MESOS-849
From: Bernardo Gomez Palacio <be...@gmail.com>
Review: https://reviews.apache.org/r/15862
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bfb16a2e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bfb16a2e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bfb16a2e
Branch: refs/heads/master
Commit: bfb16a2e1d1af6a96008c1a2eeee18728f010c55
Parents: 48d7f62
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Dec 2 16:37:00 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon Dec 2 16:37:00 2013 -0800
----------------------------------------------------------------------
bootstrap | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bfb16a2e/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index 9e6c959..ed0bc36 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,9 +10,41 @@ __EOF__
exit 1
fi
+if [ -n "$AUTOMAKE" ] || [ -n "$ACLOCAL" ] ; then
+ if [ -z "$ACLOCAL" ] || [ -z "$AUTOMAKE" ] ; then
+ _present="AUTOMAKE"
+ _missing="ACLOCAL"
+
+ [ -n "$ACLOCAL" ] && _present="ACLOCAL" && _missing="AUTOMAKE"
+
+ cat >&2 <<__EOF__
+
+[ERROR]: You are providing the path to ${_present}
+through your environment but no reference to ${_missing}.
+To fix this error please specify ${_missing} too.
+
+As an example, if you are using automake-1.12 and have
+available aclocal-1.12 you will want to do the following:
+
+ AUTOMAKE="/usr/local/bin/automake-1.12" \\
+ ACLOCAL="/usr/local/bin/aclocal-1.12" \\
+ ./bootstrap
+
+Your current environment has:
+ AUTOMAKE="$AUTOMAKE"
+ ACLOCAL="$ACLOCAL"
+
+__EOF__
+ exit 1
+ fi
+else
+ AUTOMAKE="$(which automake)"
+fi
+
# Make sure that we have a version of automake that doesn't force
# 'subdir-objects'.
-AUTOMAKE_VERSION=$(automake --version | head -1 | cut -d' ' -f4)
+
+AUTOMAKE_VERSION="$($AUTOMAKE --version | head -1 | cut -d' ' -f4)"
case ${AUTOMAKE_VERSION} in
1.14)
cat >&2 <<__EOF__