summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2010-08-04 16:06:14 +0100
committerPekka Pessi <Pekka.Pessi@nokia.com>2010-08-19 17:15:03 +0300
commit78cd6be0b57a5041ab994c396f6517d0acfdeebd (patch)
treee3ca11779bb819285ace5da277ef635f72c14aed /autogen.sh
parent5c67303b6e90dc56c6e2d9bab0c9159c83187668 (diff)
Enable silent builds, if supported
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh28
1 files changed, 22 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index 0969fc1..9a95d7c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,14 +6,30 @@ rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obso
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
autoreconf -i -f
+
+run_configure=true
+for arg in $*; do
+ case $arg in
+ --no-configure)
+ run_configure=false
+ ;;
+ *)
+ ;;
+ esac
+done
+
+if test $run_configure = true; then
+ ./configure "$@"
+fi