diff options
| author | Lennart Poettering <lennart@poettering.net> | 2003-11-15 00:57:28 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2003-11-15 00:57:28 +0000 |
| commit | 5d3ab33d269035024911183fe4ec381077e53ddb (patch) | |
| tree | c1f09a2b49525335e64ca99a8d011a103fb98c57 | |
| parent | 88acb0a4ed2bfad594e2f4ccd34f0c26f94fb663 (diff) | |
minor build fixes
git-svn-id: file:///home/lennart/svn/public/libdaemon/trunk@46 153bfa13-eec0-0310-be40-b0cb6a0e1b4b
| -rwxr-xr-x | bootstrap.sh | 16 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 5c65234..5fddd25 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # $Id$ # This file is part of libdaemon. @@ -17,9 +17,17 @@ # along with libdaemon; 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 + run_versioned automake 1.7 -a -c ./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 autoconf -Wall ./configure --sysconfdir=/etc "$@" diff --git a/examples/Makefile.am b/examples/Makefile.am index 47c567d..e0efa14 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = testd -AM_CPPFLAGS=-I../src +AM_CPPFLAGS=-I$(top_srcdir)/src testd_SOURCES=testd.c testd_LDADD=../src/libdaemon.la |