From e15d849faf299f433b91783e7c3058fa8c0c33c5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Thu, 4 Mar 2010 10:05:23 +0000
Subject: [PATCH] Updated configure (no release, just for testing)

---
 org.glite.jobid.api-c/configure | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/org.glite.jobid.api-c/configure b/org.glite.jobid.api-c/configure
index 052a801..80b119c 100755
--- a/org.glite.jobid.api-c/configure
+++ b/org.glite.jobid.api-c/configure
@@ -698,7 +698,13 @@ sub gsoap_version {
 }
 
 sub getlibdir {
-        $libdir="lib";
+	if ( -e "/etc/debian_version") { # We are on Debian
+		$lib64="lib";
+		$lib32="lib32";	}
+	else { # Another distribution
+		$lib64="lib64";
+		$lib32="lib";	}
+        $libdir=$lib32;
 
         open INP, "uname -s | "; # Check kernel name
         $kname= <INP>;
@@ -714,8 +720,7 @@ sub getlibdir {
                 close INP;
 
                 if ($arch =~/^$procname\n/) {
-                        $libdir="lib64";
-                        return ($libdir); }
+                        return ($lib64); }
 
                 open INP, "uname -m | "; # Check machine hardware
                 $machname= <INP>;
@@ -723,16 +728,15 @@ sub getlibdir {
                 close INP;
 
                 if ($arch =~/^$machname\n/) {
-                        $libdir="lib64";
-                        return ($libdir); }
+                        return ($lib64); }
 
                 # special cases (hyperlink lib64, Debian)
                 if (-l "/usr/lib64") {
-                        $libdir="lib"; }
+                        $libdir=$lib32; }
 
                 # if /usr/lib64 doesn't exist at all (AIX)
                 unless ( -e "/usr/lib64" ) {
-                        $libdir="lib"; }
+                        $libdir=$lib32; }
         }
 
         if ( $kname == "SunOS") {
@@ -743,7 +747,6 @@ sub getlibdir {
         return $libdir;
 }
 
-
 sub usage {
 	my @ext = keys %extern_prefix;
 	my @myjars, keys %jar;
-- 
1.8.2.3