X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/3d6278bc31aa7053f1228b3d874ba36f50a8c2d5..319a665ce8c5f67404e3b19ece557bd910be7814:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 79e0a7dc..08e0fa4c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This file is part of PulseAudio.
 #
@@ -16,40 +16,17 @@
 # along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-VERSION=1.11
-
-run_versioned() {
-    local P
-    local V
-
-    V=$(echo "$2" | sed -e 's,\.,,g')
-
-    if [ -e "`which $1$V 2> /dev/null`" ] ; then
-        P="$1$V"
-    else
-	if [ -e "`which $1-$2 2> /dev/null`" ] ; then
-	    P="$1-$2"
-	else
-	    P="$1"
-	fi
-    fi
-
-    shift 2
-    "$P" "$@"
-}
-
-set -ex
-
 case $(uname) in
 	*Darwin*)
 		LIBTOOLIZE="glibtoolize"
 		;;
 esac
+test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
 
 if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
-    echo "Activating pre-commit hook."
-    cp -pv  .git/hooks/pre-commit.sample .git/hooks/pre-commit
-    chmod -v +x  .git/hooks/pre-commit
+    cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
+    chmod +x .git/hooks/pre-commit && \
+    echo "Activated pre-commit hook."
 fi
 
 if [ -f .tarball-version ]; then
@@ -63,38 +40,21 @@ fi
 # configure file faulty.
 if ! pkg-config --version &>/dev/null; then
     echo "pkg-config is required to bootstrap this program" &>/dev/null
-    exit 1
+    DIE=1
 fi
 
+# Other necessary programs
+intltoolize --version >/dev/null || DIE=1
+test "$DIE" = 1 && exit 1
+
 if type -p colorgcc > /dev/null ; then
    export CC=colorgcc
 fi
 
-if [ "x$1" = "xam" ] ; then
-    run_versioned automake "$VERSION" -a -c --foreign
-    ./config.status
-else
-    rm -rf autom4te.cache
-    rm -f config.cache
-
-    rm -f Makefile.am~ configure.ac~
-    # Evil, evil, evil, evil hack
-    sed 's/read dummy/\#/' `which gettextize` | bash -s -- --copy --force
-    test -f Makefile.am~ && mv Makefile.am~ Makefile.am
-    test -f configure.ac~ && mv configure.ac~ configure.ac
-
-    touch config.rpath
-    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
-
-    intltoolize --copy --force --automake
-    "$LIBTOOLIZE" -c --force
-    run_versioned aclocal "$VERSION" -I m4
-    run_versioned autoconf 2.63 -Wall
-    run_versioned autoheader 2.63
-    run_versioned automake "$VERSION" --copy --foreign --add-missing
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
-    if test "x$NOCONFIGURE" = "x"; then
-        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
-        make clean
-    fi
+if test "x$NOCONFIGURE" = "x"; then
+    CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
+    make clean
 fi