From a67c21f093202f142438689d3f7cfbdf4ea82eea Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 28 Oct 2007 19:13:50 +0000
Subject: merge 'lennart' branch back into trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 bootstrap.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bootstrap.sh')

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 "$@" 
-- 
cgit