summaryrefslogtreecommitdiffstats
path: root/bootstrap.sh
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-07-20 01:07:06 +0000
committerLennart Poettering <lennart@poettering.net>2004-07-20 01:07:06 +0000
commitbb0b105b83c0f4ee56b4c7e9a179606aee296aa9 (patch)
treec7a83efa8830adee3b4c94a8e28d5c03c9573f20 /bootstrap.sh
parent527faf01d0605a6ced9a73017cc8155adba59d24 (diff)
sample cache work
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@98 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'bootstrap.sh')
-rwxr-xr-xbootstrap.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index c9880d85..3592ce75 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,9 +17,17 @@
# 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
+ run_versioned aclocal 1.7
libtoolize -c --force
autoheader
- automake -a -c
+ run_versioned automake 1.7 -a -c --foreign
autoconf -Wall
CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"