* add first part of zeroconf publisher

[pulseaudio] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index c9880d85e7071014a808283a22727bbe55618f54..4b9032b646303f0886db9d34f867d238595d6b5c 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,7 +4,7 @@
 # This file is part of polypaudio.
 #
 # polypaudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
+# under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
@@ -13,13 +13,21 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with polypaudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+run_versioned() {
+    local P
+    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+
+    shift 2
+    "$P" "$@"
+}
+
 if [ "x$1" = "xam" ] ; then
     set -ex
-    automake -a -c --foreign
+    run_versioned automake 1.7 -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -27,10 +35,10 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    aclocal
-    libtoolize -c --force
+    run_versioned aclocal 1.7
+    libtoolize -c --force --ltdl
     autoheader
-    automake -a -c
+    run_versioned automake 1.7 -a -c --foreign
     autoconf -Wall
 
     CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"