Removal of python-boto from the repo and add configure checks.

Python boto exists on nearly all platforms that I can think of. It
makes sense to add the check to configure and remove from the repo.

Review: https://reviews.apache.org/r/18910

Author: Timothy St. Clair

3rdparty/Makefile.am

@@ -32,20 +32,17 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@ --enable-shared=no --with-pic --srcdir=.
 
 include versions.am
 
-BOTO = boto-$(BOTO_VERSION)
 DISTRIBUTE = distribute-$(DISTRIBUTE_VERSION)
 LEVELDB = leveldb
 ZOOKEEPER = zookeeper-$(ZOOKEEPER_VERSION)
 
 
 EXTRA_DIST =		\
-  $(BOTO).zip		\
   $(DISTRIBUTE).tar.gz	\
   $(LEVELDB).tar.gz	\
   $(ZOOKEEPER).tar.gz
 
 CLEAN_EXTRACTED =	\
-  $(BOTO)		\
   $(DISTRIBUTE)		\
   $(LEVELDB)		\
   $(ZOOKEEPER)

3rdparty/boto-2.0b2.zip

@@ -19,6 +19,5 @@
 # third-party packages in exactly one place. For now, however, we
 # still need to update version numbers in src/python/setup.py.in too!
 
-BOTO_VERSION = 2.0b2
 DISTRIBUTE_VERSION = 0.6.26
 ZOOKEEPER_VERSION = 3.4.5

3rdparty/versions.am

@@ -239,31 +239,6 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-
-======================================================================
-For boto (3rdparty/boto-2.0b2.zip):
-======================================================================
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish, dis-
-tribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the fol-
-lowing conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-
 ======================================================================
 For distribute-0.6.26 (3rdparty/distribute-0.6.26.tar.gz):
 ======================================================================

LICENSE

@@ -76,7 +76,7 @@ AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
 
 AC_CONFIG_SUBDIRS([3rdparty/libprocess])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile mesos.pc])
 AC_CONFIG_FILES([ec2/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([3rdparty/Makefile])
@@ -587,6 +587,12 @@ There are two possible workarounds for this issue:
 
   AC_DEFINE([MESOS_HAS_PYTHON])
 
+  AC_PYTHON_MODULE([boto], [no],
+		   AC_MSG_WARN([can not find python-boto
+-------------------------------------------------------------------
+mesos-ec2 services will not function.
+-------------------------------------------------------------------]))
+
   has_python=yes
 fi
 

configure.ac

@@ -33,7 +33,7 @@ There are different ways you can get Mesos:
         $ sudo apt-get install openjdk-6-jdk
 
         # Install devel python.
-        $ sudo apt-get install python-dev
+	$ sudo apt-get install python-dev python-boto
 
         # Install devel libcurl
         $ sudo apt-get install libcurl4-nss-dev

docs/getting-started.md

@@ -17,4 +17,4 @@
 # limitations under the License.
 
 cd "`dirname $0`"
-PYTHONPATH="$PYTHONPATH:../third_party/boto-2.0b2.zip/boto-2.0b2" python ./mesos_ec2.py $@
+python ./mesos_ec2.py $@

ec2/mesos-ec2

@@ -0,0 +1,31 @@
+dnl @synopsis AC_PYTHON_MODULE(modname[, fatal])
+dnl
+dnl Checks for Python module.
+dnl
+dnl If fatal is non-empty then absence of a module will trigger an
+dnl error.
+dnl
+dnl @category InstalledPackages
+dnl @author Andrew Collier <[email protected]>.
+dnl @version 2004-07-14
+dnl @license AllPermissive
+
+AC_DEFUN([AC_PYTHON_MODULE],[
+	AC_MSG_CHECKING(python module: $1)
+	python -c "import $1" 2>/dev/null
+	if test $? -eq 0;
+	then
+		AC_MSG_RESULT(yes)
+		eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
+	else
+		AC_MSG_RESULT(no)
+		eval AS_TR_CPP(HAVE_PYMOD_$1)=no
+
+		$3
+
+		if test "$2" = "yes"; then
+			AC_MSG_ERROR(failed to find required module $1)
+			exit 1
+		fi
+	fi
+])

m4/ac_python_module.m4

@@ -0,0 +1,13 @@
+################################
+# Pkg-Config file for mesos    #
+################################
+
+Name: mesos
+Description: Cluster manager for sharing distributed application frameworks
+URL: http://mesos.apache.org/
+Version: @VERSION@
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@