gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-07 14:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: sdl2-config would always be detected as present

Browse Source 
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.
This commit is contained in:
Matthijs Kooijman 2020-05-12 17:34:16 +02:00 committed by Charles Pigott
parent 6dcc99edab
commit 2d5869fc79
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.lib
View File

@ -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