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 2011/06/05 08:41:22 UTC
svn commit: r1131953 - in /incubator/mesos/trunk: configure
configure.OURS.karmic64 configure.OURS.macosx configure.OURS.rcluster
configure.ac
Author: benh
Date: Sun Jun 5 06:41:22 2011
New Revision: 1131953
URL: http://svn.apache.org/viewvc?rev=1131953&view=rev
Log:
Made the configure option --with-included-zookeeper imply the option --with-zookeeper.
Modified:
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.OURS.karmic64
incubator/mesos/trunk/configure.OURS.macosx
incubator/mesos/trunk/configure.OURS.rcluster
incubator/mesos/trunk/configure.ac
Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1131953&r1=1131952&r2=1131953&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun 5 06:41:22 2011
@@ -2044,7 +2044,8 @@ WITH_INCLUDED_ZOOKEEPER="no"
# Check whether --with-included-zookeeper was given.
if test "${with_included_zookeeper+set}" = set; then
withval=$with_included_zookeeper; case "$with_included_zookeeper" in
- yes) WITH_INCLUDED_ZOOKEEPER="yes" ;;
+ yes) WITH_ZOOKEEPER="yes"
+ WITH_INCLUDED_ZOOKEEPER="yes" ;;
no) WITH_INCLUDED_ZOOKEEPER="no" ;;
*) { { echo "$as_me:$LINENO: error:
*** --with-included-zookeeper does not take arguments" >&5
Modified: incubator/mesos/trunk/configure.OURS.karmic64
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.OURS.karmic64?rev=1131953&r1=1131952&r2=1131953&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.OURS.karmic64 (original)
+++ incubator/mesos/trunk/configure.OURS.karmic64 Sun Jun 5 06:41:22 2011
@@ -1,2 +1,2 @@
#!/bin/sh
-./configure --with-python-headers=/usr/include/python2.6 --with-ruby-headers=/usr/lib/ruby/1.8/x86_64-linux --with-java-home=/usr/lib/jvm/java-6-sun --with-webui --with-zookeeper --with-included-zookeeper $@
+./configure --with-python-headers=/usr/include/python2.6 --with-ruby-headers=/usr/lib/ruby/1.8/x86_64-linux --with-java-home=/usr/lib/jvm/java-6-sun --with-webui --with-included-zookeeper $@
Modified: incubator/mesos/trunk/configure.OURS.macosx
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.OURS.macosx?rev=1131953&r1=1131952&r2=1131953&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.OURS.macosx (original)
+++ incubator/mesos/trunk/configure.OURS.macosx Sun Jun 5 06:41:22 2011
@@ -8,5 +8,4 @@ fi
--with-python-headers=/usr/include/python2.6 \
--with-java-home=$JAVA_HOME \
--with-webui \
- --with-zookeeper \
--with-included-zookeeper $@
Modified: incubator/mesos/trunk/configure.OURS.rcluster
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.OURS.rcluster?rev=1131953&r1=1131952&r2=1131953&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.OURS.rcluster (original)
+++ incubator/mesos/trunk/configure.OURS.rcluster Sun Jun 5 06:41:22 2011
@@ -1,2 +1,2 @@
#!/bin/sh
-./configure --with-python-headers=/usr/include/python2.5 --with-ruby-headers=/usr/lib/ruby/1.8/x86_64-linux --with-java-home=/usr/lib/jvm/java-6-sun --with-boost-headers=/work/mesos/boost/include --with-webui --with-zookeeper --with-included-zookeeper $@
+./configure --with-python-headers=/usr/include/python2.5 --with-ruby-headers=/usr/lib/ruby/1.8/x86_64-linux --with-java-home=/usr/lib/jvm/java-6-sun --with-boost-headers=/work/mesos/boost/include --with-webui --with-included-zookeeper $@
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131953&r1=1131952&r2=1131953&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 06:41:22 2011
@@ -175,7 +175,8 @@ AC_ARG_WITH([included-zookeeper],
AC_HELP_STRING([--with-included-zookeeper],
[build with included ZooKeeper]),
[case "$with_included_zookeeper" in
- yes) WITH_INCLUDED_ZOOKEEPER="yes" ;;
+ yes) WITH_ZOOKEEPER="yes"
+ WITH_INCLUDED_ZOOKEEPER="yes" ;;
no) WITH_INCLUDED_ZOOKEEPER="no" ;;
*) AC_MSG_ERROR([
*** --with-included-zookeeper does not take arguments]) ;;