summaryrefslogtreecommitdiffstats
path: root/bootstrap.sh
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-10-28 19:13:50 +0000
committerLennart Poettering <lennart@poettering.net>2007-10-28 19:13:50 +0000
commita67c21f093202f142438689d3f7cfbdf4ea82eea (patch)
tree5c3295037f033904bc11ab8b3adae5b7331101e9 /bootstrap.sh
parent6687dd013169fd8436aa1b45ccdacff074a40d05 (diff)
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'bootstrap.sh')
-rwxr-xr-xbootstrap.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index b85f025e..f23acbfe 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -25,10 +25,10 @@ run_versioned() {
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"
else
- if [ -e "`which $1-$2`" ] ; then
+ if [ -e "`which $1-$2 2> /dev/null`" ] ; then
P="$1-$2"
else
P="$1"
@@ -48,13 +48,14 @@ else
rm -rf autom4te.cache
rm -f config.cache
+ touch config.rpath
test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
"$LIBTOOLIZE" -c --force --ltdl
run_versioned aclocal "$VERSION"
run_versioned autoconf 2.59 -Wall
run_versioned autoheader 2.59
- run_versioned automake "$VERSION" -a -c --foreign
+ run_versioned automake "$VERSION" --copy --foreign --add-missing
if test "x$NOCONFIGURE" = "x"; then
CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"