Author: mturk
Date: Tue Nov 20 06:30:13 2012
New Revision: 1411560
URL: http://svn.apache.org/viewvc?rev=1411560&view=rev
Log:
DAEMON-265 - Correctly detect new osx java layout
Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/configure.in
Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/configure.in
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/configure.in?rev=1411560&r1=1411559&r2=1411560&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/unix/configure.in (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/configure.in Tue Nov
20 06:30:13 2012
@@ -59,8 +59,12 @@ AP_MSG_HEADER([Host support])
AP_SUPPORTED_HOST()
if test "$supported_os" = "darwin"
then
+ if test -z "$JAVA_HOME" -a -x /usr/libexec/java_home
+ then
+ JAVA_HOME="`/usr/libexec/java_home 2>dev/null`"
+ fi
if test -z "$JAVA_HOME" -a -d
/System/Library/Frameworks/JavaVM.framework/Home; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
_prevdir=`/bin/pwd`
