Commit 55f18d362568cf20a46df20ff597583e665717d3

Sam Lantinga 2019-03-16T18:45:10

Fixed bug 4544 - SDL2.m4 SDL2.framework patch made it impossible to fail detection Stian Skjelstad check if $sdl_framework is set, before checking if directory exists Patch that was merged here https://hg.libsdl.org/SDL/rev/ad4968de54ec made it impossible for the SDL2 detection to fail, since one of the if statements fails to check if a variable is set or not. if test -d $sdl_framework; then can evaluate to true in some shells. I guess it falls into undefined behaviour when looking at the POSIX standard.

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/sdl2.m4 b/sdl2.m4
index b915f99..0a73bc7 100644
--- a/sdl2.m4
+++ b/sdl2.m4
@@ -74,7 +74,7 @@ AC_ARG_VAR(SDL2_FRAMEWORK, [Path to SDL2.framework])
         done
       fi
 
-      if test -d $sdl_framework; then
+      if test x"$sdl_framework" != x && test -d "$sdl_framework"; then
         AC_MSG_RESULT($sdl_framework)
         sdl_framework_dir=`dirname $sdl_framework`
         SDL_CFLAGS="-F$sdl_framework_dir -Wl,-framework,SDL2 -I$sdl_framework/include"