diff options
| author | Javier Jardón <jjardon@gnome.org> | 2013-04-17 10:53:40 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2013-06-06 10:03:03 +0300 |
| commit | 5b0aaecb0bf822f2eba5517d74108d4158d7b51a (patch) | |
| tree | 661bd27faa2b0d22db7009993f7bc270a2173438 /bootstrap.sh | |
| parent | c6df40a5397fea49c1a8edb2ac8d5f3e74792606 (diff) | |
| download | pulseaudio-5b0aaecb0bf822f2eba5517d74108d4158d7b51a.tar.gz | |
build-sys: Use autoreconf in bootstrap.sh
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 53 |
1 files changed, 5 insertions, 48 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 0ad60ca64..8f4d3dce6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -16,30 +16,6 @@ # along with PulseAudio; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -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" - else - if [ -e "`which $1-$2 2> /dev/null`" ] ; then - P="$1-$2" - else - P="$1" - fi - fi - - shift 2 - "$P" "$@" -} - -set -ex - case $(uname) in *Darwin*) LIBTOOLIZE="glibtoolize" @@ -69,35 +45,16 @@ 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 - rm -rf autom4te.cache - rm -f config.cache - - 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 - - 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 +autopoint --force +AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose - if test "x$NOCONFIGURE" = "x"; then - CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@" - make clean - fi +if test "x$NOCONFIGURE" = "x"; then + CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@" + make clean fi |