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 2012/12/11 02:49:12 UTC
svn commit: r1419969 - in /incubator/mesos/branches/0.10.x: Makefile.am
configure.ac configure.amazon-linux-64 configure.centos-5.4-64
configure.macosx configure.ubuntu-lucid-64 configure.ubuntu-natty-64
Author: benh
Date: Tue Dec 11 01:49:11 2012
New Revision: 1419969
URL: http://svn.apache.org/viewvc?rev=1419969&view=rev
Log:
Removed OS specific configuration files.
From: Ben Mahler <be...@gmail.com>
Review: https://reviews.apache.org/r/8026
Removed:
incubator/mesos/branches/0.10.x/configure.amazon-linux-64
incubator/mesos/branches/0.10.x/configure.centos-5.4-64
incubator/mesos/branches/0.10.x/configure.macosx
incubator/mesos/branches/0.10.x/configure.ubuntu-lucid-64
incubator/mesos/branches/0.10.x/configure.ubuntu-natty-64
Modified:
incubator/mesos/branches/0.10.x/Makefile.am
incubator/mesos/branches/0.10.x/configure.ac
Modified: incubator/mesos/branches/0.10.x/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/branches/0.10.x/Makefile.am?rev=1419969&r1=1419968&r2=1419969&view=diff
==============================================================================
--- incubator/mesos/branches/0.10.x/Makefile.am (original)
+++ incubator/mesos/branches/0.10.x/Makefile.am Tue Dec 11 01:49:11 2012
@@ -34,11 +34,6 @@ all-recursive: src/python/setup.py src/j
EXTRA_DIST += bootstrap LICENSE NOTICE README support/colors.sh
-# Extra configure scripts.
-EXTRA_DIST += configure.amazon-linux-64 configure.centos-5.4-64 \
- configure.macosx configure.ubuntu-lucid-64 configure.ubuntu-natty-64
-
-
# MPI framework.
EXTRA_DIST += mpi/README mpi/mpiexec-mesos.in mpi/mpiexec-mesos.py
Modified: incubator/mesos/branches/0.10.x/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/branches/0.10.x/configure.ac?rev=1419969&r1=1419968&r2=1419969&view=diff
==============================================================================
--- incubator/mesos/branches/0.10.x/configure.ac (original)
+++ incubator/mesos/branches/0.10.x/configure.ac Tue Dec 11 01:49:11 2012
@@ -201,6 +201,10 @@ AC_PROG_CC([gcc])
ACX_PTHREAD([], [AC_MSG_ERROR([failed to find pthreads])])
+# Check for libunwind, and link it in if present.
+AC_CHECK_LIB(unwind, backtrace, LIBS="$LIBS -lunwind")
+
+
# TODO(benh): Consider using AS_IF instead of just shell 'if'
# statements for better autoconf style (the AS_IF macros also make
# sure variable dependencies are handled appropriately).
@@ -260,6 +264,16 @@ __EOF__
# Determine preprocessor flags for Java if not set.
if test -z "$JAVA_CPPFLAGS"; then
JAVA_CPPFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/$OS_NAME"
+
+ # For OSX, set JAVA_CPPFLAGS for 10.7 and above since the JAVA_HOME
+ # discovered during configure using 'java.home' does not include
+ # the JNI headers. This happens when users have not configured
+ # their jdk using the 'Java Preferences' application.
+ if test "$OS_NAME" = "darwin"; then
+ if test ! -z `sw_vers -productVersion | grep -E '10.7|10.8'`; then
+ JAVA_CPPFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
+ fi
+ fi
fi
# Determine linker flags for Java if not set.
@@ -330,7 +344,14 @@ AM_CONDITIONAL([HAS_JAVA], [test "x$has_
# Perform necessary configuration for building with Python.
if test "x$enable_python" = "xyes"; then
- AM_PATH_PYTHON() # A fatal error will occur if no interpreter is found.
+ AM_PATH_PYTHON([2.6],,
+ [AC_MSG_ERROR([mesos requires Python >= 2.6 to be installed
+ -------------------------------------------------------------------
+ If you already have Python 2.6 installed, please ensure you have
+ not set the PYTHON environment variable to point to an older
+ version of Python.
+ -------------------------------------------------------------------
+ ])])
# Determine how the generated Python egg's will get named, used in
# the Makefile to keep the targets from being rerun.