From 809a18aa7199aed1eabe56ccc3ad4ff5efed9bb3 Mon Sep 17 00:00:00 2001
From: Daniel Tang
Date: Tue, 8 Mar 2011 10:50:51 -0500
Subject: subversion - warn if JAVA_HOME is set

Subversion's JavaHL library depends on JNI headers that are only available by
installing Developer Tools. Setting JAVA_HOME to something in /System/Library
breaks because JNI headers aren't symlinked into the framework directories
here. I believe the proper JAVA_HOME setting, if necessary, is the output of
/usr/libexec/java_home, but the same effect can be achieved by not setting
JAVA_HOME at all.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/subversion.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Library/Formula/subversion.rb')

diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index f3f019bad..aa8bec600 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -68,10 +68,16 @@ class Subversion <Formula
   end
 
   def install
-    if build_java? and not build_universal?
-      opoo "A non-Universal Java build was requested."
-      puts "To use Java bindings with various Java IDEs, you might need a universal build:"
-      puts "  brew install --universal --java subversion"
+    if build_java?
+      unless build_universal?
+        opoo "A non-Universal Java build was requested."
+        puts "To use Java bindings with various Java IDEs, you might need a universal build:"
+        puts "  brew install subversion --universal --java"
+      end
+
+      unless (ENV["JAVA_HOME"] or "").empty?
+        opoo "JAVA_HOME is set. Try unsetting it if JNI headers cannot be found."
+      end
     end
 
     ENV.universal_binary if build_universal?
-- 
cgit v1.2.3