Improve automatic package finding to detect directories with version number

[builder.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 4af3a3b6e9c44f683e9f67d99051573513a655a5..362343a65598b20649956753cf2363d70f90fde7 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 # $Id$
 
-REQUIRED="core datafile path strings"
+set -e
+
+REQUIRED="core datafile fs strings io"
 CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread -ldl"
 if [ -z "$LIBPATH" ]; then
@@ -15,16 +17,13 @@ mkdir -p include/msp
 sources=source/*.cpp
 
 for i in $REQUIRED; do
-       path=$LIBPATH/$i
-       if [ ! -e $path ]; then
-               echo $i missing
+       path=`ls -1d $LIBPATH/*$i* 2>/dev/null | head -1`
+       if [ ! -d $path ]; then
+               echo msp$i missing
                exit 1
        fi
        if [ $i = "core" ]; then
-               ln -sfT $path/source/core include/msp/core
-               ln -sfT $path/source/time include/msp/time
-       elif [ $i = "misc" ]; then
-               ln -sf $path/source/*.h include/msp
+               ln -sf $path/source/* -t include/msp
        else
                ln -sfT $path/source include/msp/$i
        fi