Un-abbreviate some function and variable names

[builder.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 7b96c9639c1bf3aa58032e53cc04d13a79fe4cc9..0bf6c3d3739e558d97ab24d8a4568c8291359814 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,10 +3,16 @@
 
 set -e
 
-REQUIRED="core datafile fs strings io"
+REQUIRED="core datafile"
 CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
-if [ -e /usr/lib/libdl.so ]; then
+MACHINE="`uname -m`"
+if [ "$MACHINE" = "x86_64" ]; then
+       MULTIARCH="x86_64-linux-gnu"
+else
+       MULTIARCH="i386-linux-gnu"
+fi
+if [ -e /usr/lib/libdl.so -o -e /usr/lib/$MULTIARCH/libdl.so ]; then
        LIBS="$LIBS -ldl"
 fi
 if [ -z "$LIBPATH" -o "${LIBPATH%%/*}" ]; then