Improve automatic package finding to detect directories with version number

[builder.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 2f749090ce61eb492b18b018371d23c6597a67b5..362343a65598b20649956753cf2363d70f90fde7 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,29 +1,31 @@
 #!/bin/sh
+# $Id$
 
-REQUIRED="misc core parser path regex++ getopt++"
+set -e
+
+REQUIRED="core datafile fs strings io"
 CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
-LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
+LIBS="`pkg-config --libs sigc++-2.0` -lpthread -ldl"
 if [ -z "$LIBPATH" ]; then
-       LIBPATH=`pwd`/../libs
+       LIBPATH=`pwd`/..
 fi
 
+LIBPATH=`readlink -f $LIBPATH`
+
 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 -sf $path/source/core include/msp/core
-               ln -sf $path/source/time include/msp/time
-       elif [ $i == "misc" ]; then
-               ln -sf $path/source/*.h include/msp
+       if [ $i = "core" ]; then
+               ln -sf $path/source/* -t include/msp
        else
-               ln -sf $path/source include/msp/$i
+               ln -sfT $path/source include/msp/$i
        fi
        sources="$sources `find $path/source -name '*.cpp'`"
 done