From: Gabriele Giacone <1o5g4r8o@gmail.com>
Date: Fri, 24 Jun 2011 23:32:33 +0000 (+0200)
Subject: Add multiarch paths.
X-Git-Tag: before_android_merge~525
X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=gnash.git;a=commitdiff_plain;h=0a952522bb73e351a0967aced567dcb319285f5c

Add multiarch paths.
---

diff --git a/configure.ac b/configure.ac
index ee7601157..700abe7af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,8 +504,10 @@ if test x$cross_compiling = xyes; then
   npapi=no
 else
   AC_MSG_NOTICE([Configuring Gnash for native compilation])
+  export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
   export incllist="`eval cat ${srcdir}/macros/incllist`"
-  export libslist="`eval cat ${srcdir}/macros/libslist`"
+  libslist="`cat ${srcdir}/macros/libslist`"
+  export libslist+=" /lib/${DEB_HOST_MULTIARCH} /usr/lib/${DEB_HOST_MULTIARCH}"
   export pathlist=$PATH
 fi
 
diff --git a/macros/libslist b/macros/libslist
index df1ad5d64..8148712b4 100644
--- a/macros/libslist
+++ b/macros/libslist
@@ -1 +1 @@
-${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 /boot/common/lib /boot/system/lib/gcc4 /boot/system/lib /lib/x86_64-linux-gnu /lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu .. ../..
+${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 /boot/common/lib /boot/system/lib/gcc4 /boot/system/lib .. ../..