Small change to avoid problems when using Boost >= 1.38.0

This commit is contained in:
Bastian M. Wojek
2009-11-23 11:58:27 +00:00
parent c7f3eb3be1
commit 72f858b89a
9 changed files with 43 additions and 12 deletions

View File

@ -23,20 +23,21 @@
PATHTOAUTOCONF=$(which autoconf)
PATHTOAUTOMAKE=$(which automake)
PATHTOLIBTOOL=$(which libtoolize)
PATHTOGLIBTOOL=$(which glibtoolize)
if [ "$PATHTOAUTOCONF" == "" ]; then
if [ "$PATHTOAUTOCONF" = "" ]; then
echo
echo ">> GNU autoconf has not been found!"
echo ">> Please install it first and then re-run the script!"
echo
exit 1
elif [ "$PATHTOAUTOMAKE" == "" ]; then
elif [ "$PATHTOAUTOMAKE" = "" ]; then
echo
echo ">> GNU automake has not been found!"
echo ">> Please install it first and then re-run the script!"
echo
exit 1
elif [ "$PATHTOLIBTOOL" == "" ]; then
elif [ "$PATHTOLIBTOOL" = "" ] && [ "$PATHTOGLIBTOOL" = "" ]; then
echo
echo ">> GNU libtool has not been found!"
echo ">> Please install it first and then re-run the script!"
@ -44,6 +45,12 @@ elif [ "$PATHTOLIBTOOL" == "" ]; then
exit 1
fi
if [ "$PATHTOLIBTOOL" = "" ]; then
LIBTOOLIZE="glibtoolize"
else
LIBTOOLIZE="libtoolize"
fi
dir=`echo "$0" | sed 's,[^/]*$,,'`
test "x${dir}" = "x" && dir='.'
@ -69,7 +76,7 @@ then
autoreconf && exit 0
else
echo ">> libtoolize" && \
libtoolize --force && \
$LIBTOOLIZE --force && \
echo ">> aclocal" && \
aclocal && \
echo ">> autoconf" && \