X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=bootstrap.sh;h=cdaeee6138e989e66e4c155cc56987546bfaeb09;hb=96e132661ec82c9347f9155d3f30cd99ea8eca47;hp=2bb3259c63b8e43ecab14ee44e83817f997a459a;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 2bb3259..cdaeee6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,34 +1,37 @@
 #!/bin/sh
 # $Id$
 
-REQUIRED="core parser 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"
-if [ -z "$LIBPATH" ]; then
-	LIBPATH=`pwd`/..
+if [ -e /usr/lib/libdl.so ]; then
+	LIBS="$LIBS -ldl"
+fi
+if [ -z "$LIBPATH" -o "${LIBPATH%%/*}" ]; then
+	LIBPATH=`pwd`/${LIBPATH:-..}
 fi
 
-LIBPATH=`readlink -f $LIBPATH`
-
+rm -rf include
 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 -n1`
+	if [ -z "$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/* include/msp/
 	else
-		ln -sfT $path/source include/msp/$i
+		ln -sf $path/source include/msp/$i
 	fi
 	sources="$sources `find $path/source -name '*.cpp'`"
 done
 
+echo "Compiling builder-stage1.  This may take several minutes."
 g++ $sources -o builder-stage1 $CFLAGS $LIBS
+echo "Done."