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 07:27:28 UTC
svn commit: r1131768 [3/3] - in /incubator/mesos/trunk: configure
configure.ac src/Makefile.in
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131768&r1=1131767&r2=1131768&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 05:27:27 2011
@@ -4,29 +4,17 @@
AC_PREREQ(2.61)
AC_INIT
-# Use explicit python version 2.6.
-PYTHON=python2.6
-
-# Update CFLAGS and CXXFLAGS with environment args.
-CFLAGS="-O2 -fno-strict-aliasing -fPIC ${CFLAGS}"
-CXXFLAGS="-O2 -fno-strict-aliasing -fPIC ${CXXFLAGS}"
-
+CFLAGS="${CFLAGS} -O2 -fno-strict-aliasing -fPIC"
+CXXFLAGS="${CXXFLAGS} -O2 -fno-strict-aliasing -fPIC"
export CFLAGS
export CXXFLAGS
-
-# Update CFLAGS and CXXFLAGS in configure args.
-# TODO(benh): Don't send args just for us (e.g., --with-webui).
-ac_configure_args=`echo $ac_configure_args | \
- sed -e "s/CFLAGS=/CFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
-ac_configure_args=`echo $ac_configure_args | \
- sed -e "s/CXXFLAGS=/CXXFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
+PYTHON=python
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.3.1/src/c])
AC_CANONICAL_SYSTEM
@@ -127,18 +115,17 @@ AC_ARG_WITH([webui],
AC_SUBST(WITH_WEBUI)
AC_SUBST(WEBUI_FLAGS)
-LOCAL_ZOOKEEPER="no"
-AC_ARG_WITH([local-zookeeper],
- AC_HELP_STRING([--with-local-zookeeper],
- [Use local ZooKeeper for building]),
- [case "$with_local_zookeeper" in
- yes) LOCAL_ZOOKEEPER="yes" ;;
- no) LOCAL_ZOOKEEPER="no" ;;
- *) AC_MSG_ERROR([
-*** --with-local-zookeeper does not take arguments]) ;;
+SWIG="swig"
+AC_ARG_WITH([swig],
+ AC_HELP_STRING([--with-swig=PATH],
+ [use the SWIG binary at PATH]),
+ [case "$with_swig" in
+ yes) AC_MSG_ERROR([
+*** --with-swig requires an argument]) ;;
+ *) SWIG="$withval" ;;
esac],
[])
-AC_SUBST(LOCAL_ZOOKEEPER)
+AC_SUBST(SWIG)
# Checks for programs.
AC_PROG_CXX([g++])
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1131768&r1=1131767&r2=1131768&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 05:27:27 2011
@@ -4,6 +4,7 @@ SHELL = '/bin/sh'
CC = @CC@
CXX = @CXX@
+SWIG = @SWIG@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
@@ -152,7 +153,7 @@ $(NEXUS_LIB): $(SCHED_LIB_OBJ) $(EXEC_LI
webui/master/swig/master_wrap.cpp: webui/master/swig/master.i master_state.hpp master_webui.hpp master.hpp config.hpp
ifeq ($(WITH_WEBUI),1)
- swig -c++ -python -outdir webui/master/swig -o $@ -I../include $<
+ $(SWIG) -c++ -python -outdir webui/master/swig -o $@ -I../include $<
else
echo "" > $@
endif
@@ -168,7 +169,7 @@ nexus-master: master_main.cpp $(MASTER_O
webui/slave/swig/slave_wrap.cpp: webui/slave/swig/slave.i slave_state.hpp slave_webui.hpp slave.hpp config.hpp
ifeq ($(WITH_WEBUI),1)
- swig -c++ -python -outdir webui/slave/swig -o $@ -I../include $<
+ $(SWIG) -c++ -python -outdir webui/slave/swig -o $@ -I../include $<
else
echo "" > $@
endif
@@ -230,7 +231,7 @@ $(JAVA_LIB): swig/nexus.i $(NEXUS_LIB)
ifdef JAVA_HOME
rm -f swig/java/nexus/*
mkdir -p swig/java/nexus
- swig -c++ -java -I../include -o swig/java/nexus_wrap.cpp -outdir swig/java/nexus -package nexus swig/nexus.i
+ $(SWIG) -c++ -java -I../include -o swig/java/nexus_wrap.cpp -outdir swig/java/nexus -package nexus swig/nexus.i
$(CXX) $(CXXFLAGS) -shared -o $@ swig/java/nexus_wrap.cpp -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(OS_NAME) -L. $(LDFLAGS) -lnexus++ $(LIBS)
endif
@@ -246,13 +247,13 @@ endif
$(PYTHON_LIB): swig/nexus.i $(NEXUS_LIB)
ifdef PYTHON_HEADERS
- swig -c++ -python -threads -I../include -o swig/python/nexus_wrap.cpp -outdir swig/python swig/nexus.i
+ $(SWIG) -c++ -python -threads -I../include -o swig/python/nexus_wrap.cpp -outdir swig/python swig/nexus.i
$(CXX) $(CXXFLAGS) -shared -o $@ swig/python/nexus_wrap.cpp -I$(PYTHON_HEADERS) -L. $(LDFLAGS) -lnexus++ $(LIBS)
endif
$(RUBY_LIB): swig/nexus.i $(NEXUS_LIB)
ifdef RUBY_HEADERS
- swig -c++ -ruby -I../include -o swig/ruby/nexus_wrap.cpp -outdir swig/ruby -autorename swig/nexus.i
+ $(SWIG) -c++ -ruby -I../include -o swig/ruby/nexus_wrap.cpp -outdir swig/ruby -autorename swig/nexus.i
$(CXX) $(CXXFLAGS) -shared -o $@ swig/ruby/nexus_wrap.cpp -I$(RUBY_HEADERS) -L. $(LDFLAGS) -lnexus++ $(LIBS)
endif