build-sys: Use upstream gettext instead glib one

[pulseaudio] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index ceea55b7fe106ae638989ab4366ff2b7a55ff1f4..0ad60ca64b9b14286226f290949a321ca7cb0ac4 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -16,19 +16,19 @@
 # along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-VERSION=1.10
+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" 
+        P="$1$V"
     else
        if [ -e "`which $1-$2 2> /dev/null`" ] ; then
-           P="$1-$2" 
+           P="$1-$2"
        else
            P="$1"
        fi
@@ -40,24 +40,64 @@ run_versioned() {
 
 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
+    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
+    echo "Marking tarball version as modified."
+    echo -n `cat .tarball-version | sed 's/-rebootstrapped$//'`-rebootstrapped >.tarball-version
+fi
+
+# We check for this here, because if pkg-config is not found in the
+# system, it's likely that the pkg.m4 macro file is also not present,
+# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
+# configure file faulty.
+if ! pkg-config --version &>/dev/null; then
+    echo "pkg-config is required to bootstrap this program" &>/dev/null
+    DIE=1
+fi
+
+# Other necessary programs
+intltoolize --version >/dev/null || DIE=1
+$LIBTOOLIZE --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 
+else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    touch config.rpath
-    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
+    rm -f Makefile.am~ configure.ac~
+    autopoint --force
+    test -f Makefile.am~ && mv Makefile.am~ Makefile.am
+    test -f configure.ac~ && mv configure.ac~ configure.ac
 
-    "$LIBTOOLIZE" -c --force --ltdl
-    run_versioned aclocal "$VERSION"
-    run_versioned autoconf 2.59 -Wall
-    run_versioned autoheader 2.59
+    touch config.rpath
+    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
 
     if test "x$NOCONFIGURE" = "x"; then
-        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@" 
+        CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
         make clean
     fi
 fi