gnome-split-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 251
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: fedora-64
timestamp: Sat 2011-02-19 16:21:01 +0100
message:
  Fix dependency detection on Fedora 64
  
  Update level configure to properly detect
  installed dependencies on Fedora 64 system.
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	2011-02-19 14:25:48 +0000
+++ configure	2011-02-19 15:21:01 +0000
@@ -343,6 +343,7 @@
 my $jdk_home;
 my $jamvm_bin;
 my $cacao_bin;
+my $cpu_arch;
 
 foreach my $arg (@ARGV) {
 	my ($key, $value) = split /=/, "$arg";
@@ -433,6 +434,14 @@
 } elsif (-f "/etc/fedora-release") {
 	output "Fedora";
 	$os = "fedora";
+
+	# Detect architecture for file locations
+	if (-x "/bin/arch") {
+		my $arch = `/bin/arch`;
+		if ($arch =~ m/_64/) {
+			$cpu_arch = "64"
+		}
+	}
 } elsif (-f "/etc/SuSE-release") {
 	output "Open SuSE";
 	$os = "suse";
@@ -552,35 +561,37 @@
 		"libunixsocket-java",
 		"/usr/share/java/unix.jar");
 } elsif ($os eq "fedora") {
+    $dir = ($cpu_arch eq "64") ? "lib64" : "lib";
+
 	check_prereq(@java_gnome_jar,
 		"java-gnome library",
 		"java-gnome",
-		"/usr/lib/java-gnome/gtk.jar");
+		"/usr/$dir/java-gnome/gtk.jar");
 
 	check_prereq(@dbus_java_jar,
 		"dbus-java library",
-		"libdbus-java",
+		"dbus-java",
 		"/usr/share/java/dbus-java/dbus.jar");
 
 	check_prereq(@debug_disable_jar,
 		"matthew-debug disable library",
 		"libmatthew-java",
-		"/usr/lib/libmatthew-java/debug-disable.jar");
+		"/usr/$dir/libmatthew-java/debug-disable.jar");
 
 	check_prereq(@debug_enable_jar,
 		"matthew-debug enable library",
 		"libmatthew-java",
-		"/usr/lib/libmatthew-java/debug-enable.jar");
+		"/usr/$dir/libmatthew-java/debug-enable.jar");
 
 	check_prereq(@hexdump_jar,
 		"matthew-debug hexdump library",
 		"libmatthew-java",
-		"/usr/lib/libmatthew-java/hexdump.jar");
+		"/usr/$dir/libmatthew-java/hexdump.jar");
 
 	check_prereq(@unix_jar,
 		"Unix socket library",
 		"libmatthew-java",
-		"/usr/lib/libmatthew-java/unix.jar");
+		"/usr/$dir/libmatthew-java/unix.jar");
 } elsif ($os eq "arch") {
 	check_prereq(@java_gnome_jar,
 		"java-gnome library",