Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 18047E934 for ; Tue, 20 Nov 2012 06:30:47 +0000 (UTC) Received: (qmail 30997 invoked by uid 500); 20 Nov 2012 06:30:45 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 30647 invoked by uid 500); 20 Nov 2012 06:30:44 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 30609 invoked by uid 99); 20 Nov 2012 06:30:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 06:30:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 06:30:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8E1D523889D5 for ; Tue, 20 Nov 2012 06:30:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1411560 - /commons/proper/daemon/branches/1.0.x/src/native/unix/configure.in Date: Tue, 20 Nov 2012 06:30:14 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121120063014.8E1D523889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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`