From 88405331202339c379d412801a977a3c5581bf57 Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Tue, 21 Oct 2008 17:34:34 +0000
Subject: [PATCH] Fixes native lib location for x86/i386 architectures

---
 build.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index d341397bd..40cd7911e 100644
--- a/build.xml
+++ b/build.xml
@@ -81,14 +81,7 @@
         <isset property="is.running.linux"/>
     </condition>
 
-    <condition property="ld.library.path"
-              value="${lib}/native/linux:${system.LD_LIBRARY_PATH}">
-        <and>
-            <isset property="is.running.linux"/>
-            <os arch="x86" />
-        </and>
-    </condition>
-
+    <!-- make sure we use the linux-64 natives if this is a 64 bit system-->
     <condition property="ld.library.path"
               value="${lib}/native/linux-64:${system.LD_LIBRARY_PATH}">
         <and>
@@ -96,6 +89,11 @@
             <os arch="amd64" />
         </and>
     </condition>
+    <!-- otherwise we go for the normal linuxnatives (i.e. os.arch==i386)-->
+    <condition property="ld.library.path"
+                  value="${lib}/native/linux:${system.LD_LIBRARY_PATH}">
+                <isset property="is.running.linux"/>
+    </condition>
 
     <condition property="bundles.dest.os" value="${bundles.dest.lin}">
         <isset property="is.running.linux"/>