summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-11-18 16:02:12 +0000
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-11-18 16:07:55 +0000
commitf28972bf8ea7d42a4d4ba55b44114aff1bc80947 (patch)
tree48aece0c6b3ee6b495823332f6529582a5479994 /autogen.sh
parent92dc8a89488d1f3bd7cb9c75604fa231e260bbef (diff)
Switch to automake 1.11 to make gtk-doc happy
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index 822ebf8..c39444c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,13 +5,14 @@ gtkdocize --copy
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
+elif automake-1.11 --version >/dev/null 2>/dev/null && \
+ aclocal-1.11 --version >/dev/null 2>/dev/null; then
+ # If we have automake-1.11, use it. This is the oldest version (=>
+ # least likely to introduce undeclared dependencies) that will give us
+ # --enable-silent-rules support.
+ AUTOMAKE=automake-1.11
export AUTOMAKE
- ACLOCAL=aclocal-1.9
+ ACLOCAL=aclocal-1.11
export ACLOCAL
fi