Makefile.am | 1 -
bootstrap.sh | 53 +++++------------------------------------------------
configure.ac | 1 +
3 files changed, 6 insertions(+), 49 deletions(-)
New commits:
commit c58bb9bd6214a3cd0e99cedd54ed6200eba3cf8d
Author: Javier Jardón <jjar...@gnome.org>
Date: Wed Apr 17 10:53:41 2013 +0200
build-sys: Use build-aux directory to store autogenerated files
diff --git a/Makefile.am b/Makefile.am
index 2a1e9f6..b0b2553 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
bootstrap.sh \
- config.rpath \
git-version-gen \
LICENSE \
GPL \
diff --git a/configure.ac b/configure.ac
index 5f2398d..88d6064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen
.tarball-version)],[pulseaudi
AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules color-tests
dist-xz tar-ustar])
AS_IF([! test -n "$VERSION"], [
commit 5b0aaecb0bf822f2eba5517d74108d4158d7b51a
Author: Javier Jardón <jjar...@gnome.org>
Date: Wed Apr 17 10:53:40 2013 +0200
build-sys: Use autoreconf in bootstrap.sh
diff --git a/bootstrap.sh b/bootstrap.sh
index 0ad60ca..8f4d3dc 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
_______________________________________________
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
