diff options
| author | Joakim Verona <joakim@verona.se> | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /configure.ac | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
merge master, fix conflicts
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3e2a6006a27..1b2dd3dbd31 100644 --- a/configure.ac +++ b/configure.ac @@ -1013,9 +1013,11 @@ if test "${enableval}" != "no"; then fi fi) +dnl Prefer silent make output. For verbose output, use +dnl 'configure --disable-silent-rules' or 'make V=1' . +AM_SILENT_RULES([yes]) dnl Port to Automake 1.11. dnl This section can be removed once we assume Automake 1.14 or later. -: ${AM_DEFAULT_VERBOSITY=1} : ${AM_V=$AM_DEFAULT_VERBOSITY} : ${AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY} AC_SUBST([AM_V]) |