diff options
author | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-11-14 15:55:51 +0000 |
---|---|---|
committer | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-11-14 15:55:51 +0000 |
commit | 94a7701761034391f8528f4bf7f890894f0787cd (patch) | |
tree | 2316b5b6f91ddb0304e4775f469d11bf4a8727c5 | |
parent | c4fc461ea290168775feb4402d33c03bef56cdd1 (diff) | |
download | telepathy-farstream-94a7701761034391f8528f4bf7f890894f0787cd.tar.gz |
Require automake >= 1.9 (see telepathy-glib for rationale)
-rwxr-xr-x | autogen.sh | 14 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 14 insertions, 2 deletions
@@ -3,7 +3,19 @@ set -e gtkdocize --copy -autoreconf -i +if test -n "$AUTOMAKE"; then + : # don't override an explicit user request +elif automake-1.9 --version >/dev/null 2>/dev/null && \ + aclocal-1.9 --version >/dev/null 2>/dev/null; then + # If we have automake-1.9, use it. This helps to ensure that our build + # system doesn't accidentally grow automake-1.10 dependencies. + AUTOMAKE=automake-1.9 + export AUTOMAKE + ACLOCAL=aclocal-1.9 + export ACLOCAL +fi + +autoreconf -i -f run_configure=true for arg in $*; do diff --git a/configure.ac b/configure.ac index eff2acd..86b3787 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_INIT([Telepathy-Farsight], [tp_farsight_version], AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.8 -Wno-portability]) +AM_INIT_AUTOMAKE([1.9 -Wno-portability]) AM_CONFIG_HEADER(config.h) dnl check for tools |