update bootstrap.sh a bit

This commit is contained in:
Lennart Poettering 2008-08-05 19:42:05 +02:00
parent a32b21a417
commit 0ed4f32432
1 changed files with 13 additions and 12 deletions

View File

@ -23,15 +23,15 @@ run_versioned() {
local V local V
V=$(echo "$2" | sed -e 's,\.,,g') V=$(echo "$2" | sed -e 's,\.,,g')
if [ -e "`which $1$V`" ] ; then if [ -e "`which $1$V 2> /dev/null`" ] ; then
P="$1$V" P="$1$V"
else else
if [ -e "`which $1-$2`" ] ; then if [ -e "`which $1-$2 2> /dev/null`" ] ; then
P="$1-$2" P="$1-$2"
else else
P="$1" P="$1"
fi fi
fi fi
shift 2 shift 2
@ -43,7 +43,7 @@ set -ex
if [ "x$1" = "xam" ] ; then if [ "x$1" = "xam" ] ; then
run_versioned automake "$VERSION" -a -c --foreign run_versioned automake "$VERSION" -a -c --foreign
./config.status ./config.status
else else
rm -rf autom4te.cache rm -rf autom4te.cache
rm -f config.cache rm -f config.cache
@ -52,7 +52,8 @@ else
run_versioned autoheader 2.59 run_versioned autoheader 2.59
run_versioned automake "$VERSION" -a -c --foreign run_versioned automake "$VERSION" -a -c --foreign
CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@" if test "x$NOCONFIGURE" = "x"; then
CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
make clean make clean
fi
fi fi