Hash :
d747a66a
Author :
Date :
2022-02-20T19:06:55
m4: rework silent-rules macros to avoid double expansion Fixes automake bug https://bugs.gnu.org/32868. The AM_SILENT_RULES macro defines all the silent-rules related setup. It's also called by users to change the default verbosity level. This leads to a quirk where automake calls it, expands the full context, and then users call it, and it's fully expanded again. Instead, let's rename AM_SILENT_RULES to _AM_SILENT_RULES and move the initialization logic to late in the configure stage. This allows the user-centric AM_SILENT_RULES call to expand into a single line to set the default verbosity. * m4/init.m4: Switch to _AM_SILENT_RULES. * m4/silent.m4: Rename AM_SILENT_RULES to _AM_SILENT_RULES. Delay evaluation of AM_SILENT_RULES to the end. Define new AM_SILENT_RULES to set default rules verbosity. * t/silent-defaults.sh: New tests. * t/list-of-tests.mk: Add t/silent-defaults.sh.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164
#!/bin/sh
# Copyright (C) 2022 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Check verbose mode defaults and behavior.
. test-init.sh
: > Makefile.am
# Default behavior is currently verbose.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$ACLOCAL
$AUTOMAKE
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
# User doesn't pick a silent mode default before AM_INIT_AUTOMAKE.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_SILENT_RULES
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
# User disables silent mode default before AM_INIT_AUTOMAKE.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_SILENT_RULES([no])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
# User enables silent mode default before AM_INIT_AUTOMAKE.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_SILENT_RULES([yes])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
# User doesn't pick a silent mode default after AM_INIT_AUTOMAKE.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_INIT_AUTOMAKE
AM_SILENT_RULES
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
# User disables silent mode default after AM_INIT_AUTOMAKE.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_INIT_AUTOMAKE
AM_SILENT_RULES([no])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
# User enables silent mode default after AM_INIT_AUTOMAKE.
cat <<EOF >configure.ac
AC_INIT([silent-defaults], [1.0])
AM_INIT_AUTOMAKE
AM_SILENT_RULES([yes])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
$AUTOCONF
./configure -C
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --enable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 0' Makefile
./configure -C --disable-silent-rules
grep '^AM_DEFAULT_VERBOSITY = 1' Makefile
: