diff options
author | Matthijs Kooijman <matthijs@stdin.nl> | 2020-05-12 17:34:16 +0200 |
---|---|---|
committer | Charles Pigott <charlespigott@googlemail.com> | 2020-05-13 08:33:34 +0100 |
commit | 2d5869fc79a1f1f347ab31665148c806d54afcd9 (patch) | |
tree | 2ecd8a8ca9309ad619a299d7d52f8c07a22143d3 | |
parent | 6dcc99edab3b0ab072675ecdeffd638b644913bc (diff) | |
download | openttd-2d5869fc79a1f1f347ab31665148c806d54afcd9.tar.xz |
Fix: sdl2-config would always be detected as present
The presence of sdl2-config is used go determine whether to look for
sdl2 first, or just sdl1. However, when sdl2-config is *not* present,
`which` returns an empty string. Due to lack of quoting, this produces
`[ -x ]`, rather than `[ -x "" ]` and it turns out the former actually
has a succesful exit status for some reason.
This was not a problem when just running configure, because it would
then just fail to detect sdl2 and fall back to sdl1. However, when
passing `--with-sdl` (without specifying a version), this would only
attempt to detect sdl2, even when sdl2-config was not present, but sdl1
is.
Adding quotes makes the check work as intended.
-rw-r--r-- | config.lib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.lib b/config.lib index 6b7ee8de7..304b86e48 100644 --- a/config.lib +++ b/config.lib @@ -2434,7 +2434,7 @@ detect_sdl() { detect_pkg_config "2" "sdl2" "sdl2_config" "2.0" else sdl2_config="" - if [ -x `which sdl2-config` ]; then + if [ -x "`which sdl2-config`" ]; then detect_pkg_config "$with_sdl" "sdl2" "sdl2_config" "2.0" fi if [ -z "$sdl2_config" ]; then |