install script: add libblkid for non-ppc arches

Add dependency checks for libblkid for non-ppc arches, and determine the
proper package needed for SLES11.

This should fix bugs 1604 and 1591.

Signed-Off-By: Jon Mason <jon@opengridcomputing.com>

diff --git a/install.pl b/install.pl
index 38c69d23ec80b257f815059158b9b9d2aba69c03..fcedfea1de1eb61c879663faab9f156d25b772fe 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -256,7 +256,6 @@ sub usage
 
 my $sysfsutils;
 my $sysfsutils_devel;
-my $e2fsprogs_devel;
 
 if ($distro eq "SuSE" or $distro eq "redhat" or $distro eq "fedora" or $distro eq "Rocks") {
     $sysfsutils = "sysfsutils";
@@ -2653,7 +2652,18 @@ sub check_linux_dependencies
                     }
                 }
                 if ($arch =~ m/powerpc|ppc64/ and not -e "/usr/lib/libblkid.so") {
-                    print RED "e2fsprogs-devel 32bit is required to build rnfs-utils.", RESET "\n";
+                    if ($kernel =~ m/2.6.2[6-7]/ and $distro eq "SuSE") {
+                        print RED "libblkid-devel-32bit is required to build rnfs-utils.", RESET "\n";
+                    } else {
+                        print RED "e2fsprogs-devel-32bit is required to build rnfs-utils.", RESET "\n";
+                    }
+                    $err++;
+                } elsif (not -e "/usr/lib64/libblkid.so") {
+                    if ($kernel =~ m/2.6.2[6-7]/ and $distro eq "SuSE") {
+                        print RED "libblkid-devel is required to build rnfs-utils.", RESET "\n";
+                    } else {
+                        print RED "e2fsprogs-devel is required to build rnfs-utils.", RESET "\n";
+                    }
                     $err++;
                 }
             }