------------------------------------------------------------
revno: 250
committer: Guillaume Mazoyer <[email protected]>
branch nick: mandriva-build
timestamp: Sat 2011-02-19 15:25:48 +0100
message:
Detect Mandriva
Update level configure to properly detect
installed Java on Mandriva Linux systems.
modified:
configure
--
lp:gnome-split
https://code.launchpad.net/~respawneral/gnome-split/mainline
Your team GNOME Split developers is subscribed to branch lp:gnome-split.
To unsubscribe from this branch go to
https://code.launchpad.net/~respawneral/gnome-split/mainline/+edit-subscription
=== modified file 'configure'
--- configure 2010-11-21 23:37:26 +0000
+++ configure 2011-02-19 14:25:48 +0000
@@ -954,19 +954,18 @@
my $javadoc_candidate;
my $vendor;
if ($jdk_home) {
+ $javac_candidate = "$jdk_home/bin/javac";
+ $javah_candidate = "$jdk_home/bin/javah";
+ $jar_candidate = "$jdk_home/bin/jar";
+ $javadoc_candidate = "$jdk_home/bin/javadoc";
$vendor = "Specified";
} else {
- if ( $ENV{'JAVA_HOME'} ) {
- $jdk_home = $ENV{'JAVA_HOME'};
- $vendor = "Sun";
- } else {
- # will fail
- }
+ $javac_candidate = which("javac");
+ $javah_candidate = which("javah");
+ $jar_candidate = which("jar");
+ $javadoc_candidate = which("javadoc");
+ $vendor = "System";
}
- $javac_candidate = "$jdk_home/bin/javac";
- $javah_candidate = "$jdk_home/bin/javah";
- $jar_candidate = "$jdk_home/bin/jar";
- $javadoc_candidate = "$jdk_home/bin/javadoc";
check_compiler($javac, "$vendor javac", $javac_candidate, "-g");
check_jar($jar, "$vendor jar", $jar_candidate, "");
@@ -1180,16 +1179,12 @@
my $vendor;
if ($jdk_home) {
+ $java_candidate = "$jdk_home/bin/java";
$vendor = "Specified";
} else {
- if ( $ENV{'JAVA_HOME'} ) {
- $jdk_home = $ENV{'JAVA_HOME'};
- $vendor = "Sun";
- } else {
- # will fail
- }
+ $java_candidate = which("java");
+ $vendor = "System";
}
- $java_candidate = "$jdk_home/bin/java";
check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea");
_______________________________________________
Mailing list: https://launchpad.net/~gnome-split-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~gnome-split-team
More help : https://help.launchpad.net/ListHelp
