From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 26 Apr 2012 17:22:35 +0000 (+0000)
Subject: Stricker check of java locations, ignore environment if necessary (fixes stage build... 
X-Git-Tag: glite-lb-server_R_2_3_5_1~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b64e672520d201f04b7ff32409d6bfd6a5af6fbf;p=jra1mw.git

Stricker check of java locations, ignore environment if necessary (fixes stage build in ETICS on Debian).
---

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 5e48a11..007c7b2 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -400,15 +400,15 @@ if ($mode eq 'build') { for my $ext (keys %externs) {
 		my $jdk_prefix;
 
 		print "Looking for some caffein ... ";
-		if (defined $ENV{'JDK_HOME'}) {
+		if (defined($ENV{'JDK_HOME'}) and -f "$ENV{'JDK_HOME'}/include/jni.h") {
 			$jdk_prefix = $ENV{'JDK_HOME'};
 			print "JDK_HOME=$jdk_prefix\n";
-		} elsif (defined $ENV{'JAVA_HOME'}) {
+		} elsif (defined($ENV{'JAVA_HOME'}) and -f "$ENV{'JAVA_HOME'}/include/jni.h") {
 			$jdk_prefix = $ENV{'JAVA_HOME'};
 			print "JAVA_HOME=$jdk_prefix\n";
 		} else {
 			foreach my $i (0..$#{$externs{$ext}{locations}}) {
-				if (-e $externs{$ext}{locations}[$i]) {
+				if (-e $externs{$ext}{locations}[$i] and -f "$externs{$ext}{locations}[$i]/include/jni.h") {
 					$jdk_prefix=$externs{$ext}{locations}[$i];
 					print "(found directory $jdk_prefix)\n";
 					last;