From b64e672520d201f04b7ff32409d6bfd6a5af6fbf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 26 Apr 2012 17:22:35 +0000 Subject: [PATCH] Stricker check of java locations, ignore environment if necessary (fixes stage build in ETICS on Debian). --- org.glite.lb/configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 1.8.2.3