]> git.feebdaed.xyz Git - 0xmirror/curl.git/commit
autotools: tidy-up `if` expressions
authorViktor Szakats <commit@vsz.me>
Tue, 5 Aug 2025 14:07:21 +0000 (16:07 +0200)
committerViktor Szakats <commit@vsz.me>
Wed, 10 Dec 2025 21:29:19 +0000 (22:29 +0100)
commit8db0e286b363ad788d6dc0779d605b83c7ed4caf
tree4085c0a79e163c84c0f2a00d1622c82ab11fcc30
parentcc285649dc95b73eef5d498d93d0cdcc75b1e5c7
autotools: tidy-up `if` expressions

- drop x-hacks for curl internal variables and certain autotools ones
  that do not hold custom values.
- make x-hacks consistently use `"x$var" = "xval"` style.
- add a few x-hacks for input/external variables that may hold custom
  values.
- prefer `-z` and `-n` to test empty/non-empty.
  This also makes some x-hacks unnecessary.
- optimized negated test `-z` and `-n` options.
- prefer `&&` and `||` over `-a` and `-o`.
  For better POSIX compatibility:
  https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
- quote variables passed to `test`, where missing.
- quote string literals in comparisons.
- fix some indentation, whitespace.

Note that a few `case` statements also use the x-hack, which looks
unnecessary. This patch does not change them.

Verified by comparing feature detection results with a reference CI run
from before this patch (PR #19922).

Refs:
https://www.shellcheck.net/wiki/SC2268
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
https://www.vidarholen.net/contents/blog/?p=1035
https://mywiki.wooledge.org/BashPitfalls#A.5B_.24foo_.3D_.22bar.22_.5D

Closes #18189
19 files changed:
acinclude.m4
configure.ac
curl-config.in
docs/libcurl/libcurl.m4
m4/curl-amissl.m4
m4/curl-apple-sectrust.m4
m4/curl-compilers.m4
m4/curl-confopts.m4
m4/curl-functions.m4
m4/curl-gnutls.m4
m4/curl-mbedtls.m4
m4/curl-openssl.m4
m4/curl-rustls.m4
m4/curl-schannel.m4
m4/curl-sysconfig.m4
m4/curl-wolfssl.m4
m4/xc-lt-iface.m4
m4/xc-val-flgs.m4
m4/zz40-xc-ovr.m4