You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2014/04/03 23:45:57 UTC
git commit: Enable automake 1.14.
Repository: mesos
Updated Branches:
refs/heads/master 26e4df5ce -> 0653d7fd3
Enable automake 1.14.
Review: https://reviews.apache.org/r/19854
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0653d7fd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0653d7fd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0653d7fd
Branch: refs/heads/master
Commit: 0653d7fd39259d5bc5606881dd0b51aa8e26fa2d
Parents: 26e4df5
Author: Timothy St. Clair <ts...@redhat.com>
Authored: Thu Apr 3 14:45:36 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Thu Apr 3 14:45:36 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/configure.ac | 3 ++-
bootstrap | 18 ------------------
configure.ac | 3 ++-
3 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0653d7fd/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index 2e0b72c..3c515ef 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -15,7 +15,8 @@ AC_CONFIG_MACRO_DIR([m4])
# Initialize automake.
# -Wno-portability, since we require GNU Make for % patterns.
-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
+# Removal of -Werror due warnings introduced by automake 1.14.
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
# Required for linking non-POSIX libs.
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
http://git-wip-us.apache.org/repos/asf/mesos/blob/0653d7fd/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index ed0bc36..5727550 100755
--- a/bootstrap
+++ b/bootstrap
@@ -41,24 +41,6 @@ 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)"
-case ${AUTOMAKE_VERSION} in
- 1.14)
- cat >&2 <<__EOF__
-
-Mesos requires automake < 1.14 due to incompatibility issues
-with the 'subdir-objects' option.
-
-See https://issues.apache.org/jira/browse/MESOS-577 and
-please downgrade your automake installation.
-
-__EOF__
- exit 1
- ;;
-esac
# Note that we don't use '--no-recursive' because older versions of
# autoconf/autoreconf bail with that option. Unfortunately this means
http://git-wip-us.apache.org/repos/asf/mesos/blob/0653d7fd/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5404dc2..c1de6d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,8 @@ AC_CONFIG_MACRO_DIR([m4])
# Initialize automake.
# -Wno-portability, since we require GNU Make for % patterns
-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
+# Removal of -Werror due warnings introduced by automake 1.14.
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
# This is required for linking non-POSIX libs.
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])