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:47:37 UTC
svn commit: r1131908 [3/3] - in /incubator/mesos/trunk: configure
configure.ac src/Makefile.in src/config.hpp.in
src/tests/test_sample_frameworks.cpp
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131908&r1=1131907&r2=1131908&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 05:47:37 2011
@@ -70,40 +70,58 @@ case "${target_os}" in
AC_SUBST(OS_NAME)
JAVA_HOME=""
+HAS_JAVA="0"
AC_ARG_WITH([java-home],
AC_HELP_STRING([--with-java-home=DIR],
[find Java Development Kit in DIR]),
[case "$with_java_home" in
- yes) AC_MSG_ERROR([
+ yes)
+ AC_MSG_ERROR([
*** --with-java-home requires an argument]) ;;
- *) JAVA_HOME="$withval" ;;
+ *)
+ JAVA_HOME="$withval"
+ HAS_JAVA="1"
+ ;;
esac],
[])
AC_SUBST(JAVA_HOME)
+AC_SUBST(HAS_JAVA)
PYTHON_HEADERS=""
+HAS_PYTHON="0"
AC_ARG_WITH([python-headers],
AC_HELP_STRING([--with-python-headers=DIR],
[find Python headers in DIR]),
[case "$with_python_headers" in
- yes) AC_MSG_ERROR([
+ yes)
+ AC_MSG_ERROR([
*** --with-python-headers requires an argument]) ;;
- *) PYTHON_HEADERS="$withval" ;;
+ *)
+ PYTHON_HEADERS="$withval"
+ HAS_PYTHON="1"
+ ;;
esac],
[])
AC_SUBST(PYTHON_HEADERS)
+AC_SUBST(HAS_PYTHON)
RUBY_HEADERS=""
+HAS_RUBY="0"
AC_ARG_WITH([ruby-headers],
AC_HELP_STRING([--with-ruby-headers=DIR],
[find Ruby headers in DIR]),
[case "$with_ruby_headers" in
- yes) AC_MSG_ERROR([
+ yes)
+ AC_MSG_ERROR([
*** --with-ruby-headers requires an argument]) ;;
- *) RUBY_HEADERS="$withval" ;;
+ *)
+ RUBY_HEADERS="$withval"
+ HAS_RUBY="1"
+ ;;
esac],
[])
AC_SUBST(RUBY_HEADERS)
+AC_SUBST(HAS_RUBY)
WITH_WEBUI="0"
WEBUI_FLAGS=""
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1131908&r1=1131907&r2=1131908&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 05:47:37 2011
@@ -75,16 +75,6 @@ CXXFLAGS += -DBUILD_DATE="\"$$(date '+%Y
CFLAGS += -DBUILD_USER="\"$$USER\""
CXXFLAGS += -DBUILD_USER="\"$$USER\""
-# Expose whether we have Java and Python support through defines
-ifdef JAVA_HOME
- CFLAGS += -DMESOS_HAS_JAVA
- CXXFLAGS += -DMESOS_HAS_JAVA
-endif
-ifdef PYTHON_HEADERS
- CFLAGS += -DMESOS_HAS_PYTHON
- CXXFLAGS += -DMESOS_HAS_PYTHON
-endif
-
# Add libev to LDFLAGS.
LDFLAGS += -L$(LIBEV)/.libs
Modified: incubator/mesos/trunk/src/config.hpp.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/config.hpp.in?rev=1131908&r1=1131907&r2=1131908&view=diff
==============================================================================
--- incubator/mesos/trunk/src/config.hpp.in (original)
+++ incubator/mesos/trunk/src/config.hpp.in Sun Jun 5 05:47:37 2011
@@ -3,10 +3,11 @@
/* This header gets completed by configure. */
-#include <string>
-
#if @WITH_WEBUI@
#define NEXUS_WEBUI
#endif
+#define MESOS_HAS_JAVA @HAS_JAVA@
+#define MESOS_HAS_PYTHON @HAS_PYTHON@
+
#endif /* __CONFIG_HPP__ */
Modified: incubator/mesos/trunk/src/tests/test_sample_frameworks.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_sample_frameworks.cpp?rev=1131908&r1=1131907&r2=1131908&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_sample_frameworks.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_sample_frameworks.cpp Sun Jun 5 05:47:37 2011
@@ -1,15 +1,16 @@
#include <gtest/gtest.h>
+#include "config.hpp"
#include "external_test.hpp"
// Run each of the sample frameworks in local mode
TEST_EXTERNAL(SampleFrameworks, CFramework)
TEST_EXTERNAL(SampleFrameworks, CppFramework)
-#ifdef MESOS_HAS_JAVA
+#if MESOS_HAS_JAVA
TEST_EXTERNAL(SampleFrameworks, JavaFramework)
TEST_EXTERNAL(SampleFrameworks, JavaExceptionFramework)
#endif
-#ifdef MESOS_HAS_PYTHON
+#if MESOS_HAS_PYTHON
TEST_EXTERNAL(SampleFrameworks, PythonFramework)
#endif