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 10:49:16 UTC
svn commit: r1132135 - in /incubator/mesos/trunk: configure configure.ac
configure.template.macosx src/Makefile.in
Author: benh
Date: Sun Jun 5 08:49:16 2011
New Revision: 1132135
URL: http://svn.apache.org/viewvc?rev=1132135&view=rev
Log:
Added a --with-java-headers option to configure to allow specifying a
location other than JAVA_HOME/include for the JNI headers. This is
necessary in the latest Java update on OS X because none of the JVM
"Home" directories contains an include directory anymore. The behavior
when you specify just JAVA_HOME and not JAVA_HEADERS should be the same
as before (we look in JAVA_HOME/include/OS_NAME).
Fixes #135.
Modified:
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/configure.template.macosx
incubator/mesos/trunk/src/Makefile.in
Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1132135&r1=1132134&r2=1132135&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun 5 08:49:16 2011
@@ -578,6 +578,7 @@ PYTHON_LDFLAGS
PYTHON_HEADERS
HAS_JAVA
JAVA_HOME
+JAVA_HEADERS
OS_NAME
target_os
target_vendor
@@ -633,6 +634,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+with_java_headers
with_java_home
with_python_headers
with_webui
@@ -1266,6 +1268,8 @@ if test -n "$ac_init_help"; then
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-java-headers=DIR find Java headers in DIR (if different from
+ JAVA_HOME/include)
--with-java-home=DIR find Java Development Kit in DIR
--with-python-headers=DIR
find Python headers in DIR
@@ -1997,6 +2001,22 @@ case "${target_os}" in
# Export OS name to Makefiles
+JAVA_HEADERS=""
+
+# Check whether --with-java-headers was given.
+if test "${with_java_headers+set}" = set; then :
+ withval=$with_java_headers; case "$with_java_headers" in
+ yes)
+ as_fn_error "
+*** --with-java-headers requires an argument" "$LINENO" 5 ;;
+ *)
+ JAVA_HEADERS="$withval"
+ ;;
+ esac
+fi
+
+
+
JAVA_HOME=""
HAS_JAVA="0"
@@ -2009,6 +2029,9 @@ if test "${with_java_home+set}" = set; t
*)
JAVA_HOME="$withval"
HAS_JAVA="1"
+ if test -z "$JAVA_HEADERS"; then
+ JAVA_HEADERS="$JAVA_HOME/include/$OS_NAME"
+ fi
;;
esac
fi
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1132135&r1=1132134&r2=1132135&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 08:49:16 2011
@@ -74,6 +74,21 @@ case "${target_os}" in
# Export OS name to Makefiles
AC_SUBST(OS_NAME)
+JAVA_HEADERS=""
+AC_ARG_WITH([java-headers],
+ AC_HELP_STRING([--with-java-headers=DIR],
+ [find Java headers in DIR (if different from JAVA_HOME/include)]),
+ [case "$with_java_headers" in
+ yes)
+ AC_MSG_ERROR([
+*** --with-java-headers requires an argument]) ;;
+ *)
+ JAVA_HEADERS="$withval"
+ ;;
+ esac],
+ [])
+AC_SUBST(JAVA_HEADERS)
+
JAVA_HOME=""
HAS_JAVA="0"
AC_ARG_WITH([java-home],
@@ -86,6 +101,9 @@ AC_ARG_WITH([java-home],
*)
JAVA_HOME="$withval"
HAS_JAVA="1"
+ if test -z "$JAVA_HEADERS"; then
+ JAVA_HEADERS="$JAVA_HOME/include/$OS_NAME"
+ fi
;;
esac],
[])
Modified: incubator/mesos/trunk/configure.template.macosx
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.template.macosx?rev=1132135&r1=1132134&r2=1132135&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.template.macosx (original)
+++ incubator/mesos/trunk/configure.template.macosx Sun Jun 5 08:49:16 2011
@@ -1,11 +1,16 @@
-#!/bin/sh
+#!/bin/bash
if test -z "$JAVA_HOME"; then
- JAVA_HOME=/Library/Java/Home
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
-$(dirname $0)/configure \
+if test -z "$JAVA_HEADERS"; then
+ JAVA_HEADERS=/System/Library/Frameworks/JavaVM.framework/Headers
+fi
+
+$(dirname $0)/configure \
--with-python-headers=/usr/include/python2.6 \
--with-java-home=$JAVA_HOME \
+ --with-java-headers=$JAVA_HEADERS \
--with-webui \
--with-included-zookeeper $@
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1132135&r1=1132134&r2=1132135&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 08:49:16 2011
@@ -19,6 +19,7 @@ LIBS = @LIBS@
OS_NAME = @OS_NAME@
JAVA_HOME = @JAVA_HOME@
+JAVA_HEADERS = @JAVA_HEADERS@
PYTHON_HEADERS = @PYTHON_HEADERS@
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
@@ -323,7 +324,7 @@ ifdef JAVA_HOME
rm -f swig/java/mesos/*
mkdir -p swig/java/mesos
$(SWIG) -c++ -java -I@top_srcdir@/include -o swig/java/mesos_wrap.cpp -outdir swig/java/mesos -package mesos @srcdir@/swig/mesos.i
- $(CXX) $(CXXFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(OS_NAME) -shared -o $@ swig/java/mesos_wrap.cpp $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(LIBS)
+ $(CXX) $(CXXFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HEADERS) -shared -o $@ swig/java/mesos_wrap.cpp $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) $(LDFLAGS) $(LIBS)
endif
$(MESOS_PYTHON_LIB): @srcdir@/swig/mesos.i $(MESOS_SCHED_LIB) $(MESOS_EXEC_LIB) | $(LIBDIR)/python