add pa_rtclock_usec() API

[pulseaudio] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 1f8b29d0b724e8a06b153ed7e9b623183ddb4f67..f23acbfef647a18461c22988d91cc151d084a1f0 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"
@@ -48,16 +48,17 @@ 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 --enable-force-preopen "$@" 
+        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@" 
         make clean
     fi
 fi