summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-02-06 23:17:32 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-02-06 23:17:32 +0100
commitdf6841b7d543abc9731b4b42a2392089a41fb838 (patch)
tree323450afd585546b0fe0b3d612a7442d4c46e694 /configure.ac
parent9f2642d4f91d5d6191b21ae1df5842b261c0b854 (diff)
parentea4f1a91ac1c11a91a21169125b7ed931a4ab7fe (diff)
downloadautomake-df6841b7d543abc9731b4b42a2392089a41fb838.tar.gz
Merge branch 'maint' into yacc-work
* maint: (75 commits) test defs: function 'is_newest' now works also with directories refactor: new variable telling whether make is running in "dry mode" ...
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index fa05a494f..78c66334d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@ AC_INIT([GNU Automake], [1.11.0a], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
+AM_SILENT_RULES([yes])
+
AC_CANONICAL_BUILD
# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
@@ -223,9 +225,9 @@ AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
AC_CONFIG_FILES([
Makefile
+ contrib/Makefile
doc/Makefile
lib/Automake/Makefile
- lib/Automake/tests/Makefile
lib/Makefile
lib/am/Makefile
m4/Makefile