build: fix formatting and misc in configure #5488
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s/bean/been Added on commit d1acb31 ("compile time: enable LTS", 2021-02-28).
Consider the current code:
AS_IF([test "x$enable_lts" = "xyes"], [
# ...
HAVE_CONTRIB_INSTALL="no",
Result of testing the value:
$ HAVE_CONTRIB_INSTALL="no",
$ printf '%s\n' "$HAVE_CONTRIB_INSTALL"
no,
$ test "x$HAVE_CONTRIB_INSTALL" = "xno" &&
echo equal || echo 'not equal'
not equal
This means that whenever HAVE_LTS is enabled, HAVE_CONTRIB_INSTALL is
always considered enabled when testing against "no".
But luckily, in the current code the latter variable is only tested
against "yes", so nothing should be affected:
$ git grep HAVE_CONTRIB_INSTALL |
grep -v -e '^configure:' -e '^configure.ac:'
Makefile:ifeq ($(HAVE_CONTRIB_INSTALL),yes)
config.mk.in:HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
Added on commit d1acb31 ("compile time: enable LTS", 2021-02-28).
Added on commit d1acb31 ("compile time: enable LTS", 2021-02-28). Note: Do not print a preceding blank line because one is already printed right before the warning message, right after the items on "Features:". Example of the resulting warning message: $ autoconf && ./configure [...] configure: creating ./config.status config.status: creating config.mk config.status: creating config.sh Compile options: [...] prefix: /usr/local sysconfdir: ${prefix}/etc Spectre compiler patch: yes Features: [...] SELinux labeling support: user namespace: -DHAVE_USERNS X11 sandboxing support: -DHAVE_X11 ********************************************************* * Warning: Long-term support (LTS) was enabled! * * Most compile-time options have been rewritten! * ********************************************************* $
Instead of binding them together with conditionals in a single line, split shell commands into multiple lines to make them more readable. Note that for the macro arguments in question, the content inside [] quotes is output literally into ./configure, so the commands can be written as if they were in a shell script directly (save for any special characters/tokens in Autoconf). Misc: Relates to commit 2c64d1f ("use AX_CHECK_COMPILE_FLAG to check for spectre flags", 2019-06-21).
Misc: I missed this one on commit 221c101 ("configure*: Add missing quotes to arguments", 2021-06-03) / PR netblue30#4712.
kmk3
changed the title
reinerh
approved these changes
Dec 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commits:
Relates to #4712.