gobject: ga_service_browser_new() should accept const gchar*

[catta] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index a416dbe78eabc9d8a4e9b47e18ebebabbd327b35..2c68a6c3ec59bb712e669efcae03e39104b58010 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,4 @@
-#!/bin/sh
-# $Id$
+#!/bin/bash
 
 # This file is part of avahi.
 #
@@ -18,11 +17,24 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-VERSION=1.9
+AM_VERSION=1.11
+AC_VERSION=2.63
 
 run_versioned() {
     local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+    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" "$@"
@@ -30,20 +42,36 @@ run_versioned() {
 
 set -ex
 
+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 [ "x$1" = "xam" ] ; then
-    run_versioned automake "$VERSION" -a -c --foreign
+    run_versioned automake "$AM_VERSION" -a -c --foreign
     ./config.status
 else 
     rm -rf autom4te.cache
     rm -f config.cache
 
-    libtoolize -c --force
-    run_versioned aclocal "$VERSION" -I common
-    autoconf -Wall
-    autoheader
-    run_versioned automake "$VERSION" -a -c --foreign
+    rm -f Makefile.am~ configure.ac~
+    # Evil, evil, evil, evil hack
+    sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force
+    test -f Makefile.am~ && mv Makefile.am~ Makefile.am
+    test -f configure.ac~ && mv configure.ac~ configure.ac
+
+    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
 
-    ./configure "$@"
+    intltoolize --copy --force --automake
+    "$LIBTOOLIZE" -c --force
+    run_versioned aclocal "$AM_VERSION" -I common
+    run_versioned autoconf "$AC_VERSION" -Wall
+    run_versioned autoheader "$AC_VERSION"
+    run_versioned automake "$AM_VERSION" -a -c --foreign
 
-    make clean
+    if test "x$NOCONFIGURE" = "x"; then
+        ./configure "$@"
+        make clean
+    fi
 fi