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/01/27 04:47:21 UTC
svn commit: r1236508 - in /incubator/mesos/trunk: configure.ac
src/Makefile.am
Author: benh
Date: Fri Jan 27 03:47:21 2012
New Revision: 1236508
URL: http://svn.apache.org/viewvc?rev=1236508&view=rev
Log:
Deals with an issue with old automake versions (< 1.11).
Modified:
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/src/Makefile.am
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1236508&r1=1236507&r2=1236508&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Fri Jan 27 03:47:21 2012
@@ -17,7 +17,7 @@
# Generated with autoscan, then modified appropriately.
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
+AC_PREREQ([2.61])
AC_INIT([mesos], [0.0.1])
# Have autoconf setup some variables related to the system.
@@ -25,6 +25,10 @@ AC_CANONICAL_HOST
AC_CANONICAL_BUILD
AC_CANONICAL_TARGET
+AC_LANG([C++])
+
+AC_CONFIG_MACRO_DIR([m4])
+
# Initialize automake.
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
@@ -35,19 +39,13 @@ LT_INIT
LT_LANG([C++])
LT_OUTPUT
-AC_LANG(C++)
-
-AC_CONFIG_MACRO_DIR([m4])
-
# The default CFLAGS/CXXFLAGS from autoconf when using gcd is usually
# "-g -O2". These really slow down compiling our tests, so we turn
# them off and enable them (where desired) directly in the
# Makefile. Note that this should not have an impact on users setting
# CFLAGS/CXXFLAGS directly at configure time, or when running make.
-AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
- [CFLAGS=""])
-AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
- [CXXFLAGS=""])
+AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"], [CFLAGS=""])
+AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], [CXXFLAGS=""])
# Force all third_party libraries to only build static libraries so
# that we can produce a final shared library which includes everything
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1236508&r1=1236507&r2=1236508&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Fri Jan 27 03:47:21 2012
@@ -29,6 +29,11 @@ ZOOKEEPER = third_party/zookeeper-3.3.1/
LIBPROCESS = third_party/libprocess
LIBEV = $(LIBPROCESS)/third_party/libev-3.8
+# Unfortunatley, 'pkglibexecdir' is not set before automake 1.11, so
+# we need to do it manually (unless we in the future assume an
+# automake version).
+pkglibexecdir = $(libexecdir)/$(PACKAGE)
+
# These next definitions may not seem like, much, but they are very
# important! They inform where things that have the webui_, pythonegg_
# and javalib_ prefix get installed! Also note that pkg*dir contains
@@ -531,8 +536,10 @@ $(MESOS_EGG): python/setup.py $(srcdir)/
$(PYTHON_PROTOS) libmesos_no_third_party.la \
$(PROTOBUF_EGG)
@echo "Building Mesos Python egg ..."
- @$(MKDIR_P) python/src
- @cp -pf $(srcdir)/python/src/mesos.py python/src
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ @$(MKDIR_P) python/src; \
+ cp -pf $(srcdir)/python/src/mesos.py python/src; \
+ fi
@cp -pf $(PYTHON_PROTOS) python/src
@PYTHONPATH=../$(SETUPTOOLS) $(PYTHON) python/setup.py bdist_egg