mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r1131634 - in /incubator/mesos/trunk: configure configure.ac
Date Sun, 05 Jun 2011 03:32:40 GMT
Author: benh
Date: Sun Jun  5 03:32:40 2011
New Revision: 1131634

URL: http://svn.apache.org/viewvc?rev=1131634&view=rev
Log:
Require python2.6

Modified:
    incubator/mesos/trunk/configure
    incubator/mesos/trunk/configure.ac

Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1131634&r1=1131633&r2=1131634&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun  5 03:32:40 2011
@@ -1677,7 +1677,7 @@ CFLAGS="${CFLAGS} -O2 -fno-strict-aliasi
 CXXFLAGS="${CXXFLAGS} -O2 -fno-strict-aliasing -fPIC"
 export CFLAGS
 export CXXFLAGS
-PYTHON=python
+PYTHON=python2.6
 ac_configure_args="$ac_configure_args --enable-shared=no"
 
 ac_config_files="$ac_config_files Makefile src/Makefile src/config.hpp"

Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131634&r1=1131633&r2=1131634&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun  5 03:32:40 2011
@@ -8,15 +8,13 @@ CFLAGS="${CFLAGS} -O2 -fno-strict-aliasi
 CXXFLAGS="${CXXFLAGS} -O2 -fno-strict-aliasing -fPIC"
 export CFLAGS
 export CXXFLAGS
-PYTHON=python
-
-ac_configure_args="--enable-shared=no --with-pic"
+PYTHON=python2.6
+ac_configure_args="$ac_configure_args --enable-shared=no"
 
 AC_CONFIG_FILES([Makefile src/Makefile src/config.hpp])
 AC_CONFIG_SUBDIRS([src/third_party/libprocess])
 AC_CONFIG_SUBDIRS([src/third_party/gtest-1.4.0-patched])
 AC_CONFIG_SUBDIRS([src/third_party/glog-0.3.0])
-AC_CONFIG_SUBDIRS([src/third_party/zookeeper-3.2.2/src/c])
 
 AC_CANONICAL_SYSTEM
 
@@ -117,20 +115,6 @@ AC_ARG_WITH([webui],
 AC_SUBST(WITH_WEBUI)
 AC_SUBST(WEBUI_FLAGS)
 
-WITH_ZOOKEEPER="0"
-AC_ARG_WITH([zookeeper],
-  AC_HELP_STRING([--with-zookeeper],
-                 [enable ZooKeeper support]),
-	         [case "$with_zookeeper" in
-		    yes) WITH_ZOOKEEPER="1" ;;
-                    no) WITH_ZOOKEEPER="0" ;;
-		    *) AC_MSG_ERROR([
-*** --with-zookeeper does not take arguments]) ;;
-	          esac],
-	         [])
-AC_SUBST(WITH_ZOOKEEPER)
-
-
 # Checks for programs.
 AC_PROG_CXX([g++])
 AC_PROG_CC([gcc])



Mime
View raw message