deactivate module-x11-xsmp by default, due to a deadlock when pa is being started...

[pulseaudio] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index b85f025eb39d6c5fc51364efc9233dae2362b38e..b8db16fa23d25425c009f897e178fad16d12a91a 100755 (executable)
--- 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"
@@ -54,7 +54,7 @@ else
     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 "$@"