From 5a385d772194809ee72cb258aba1aae54ff0dd7e Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 19 Sep 2011 09:07:07 +0000 Subject: [PATCH] Detect multiarch in bootstrap.sh as well --- bootstrap.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 26b8b31..0bf6c3d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -6,7 +6,13 @@ set -e 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 -- 2.45.2