Patchwork [1/2] configure: don't check for Cocoa when detecting SDL.

login
register
mail settings
Submitter andrzej zaborowski
Date Dec. 7, 2011, 7:47 a.m.
Message ID <1323244048-6021-2-git-send-email-balrogg@gmail.com>
Download mbox | patch
Permalink /patch/130013/
State New
Headers show

Comments

andrzej zaborowski - Dec. 7, 2011, 7:47 a.m.
The SDL check is supposed to set $sdl to "yes" or "no", but with that
check it leaves $sdl unset on darwin, unless --enable-cocoa was
specified (which is not needed to enable cocoa anyway).

Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
---
 configure |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
Andreas Färber - Dec. 7, 2011, 9:26 p.m.
Am 07.12.2011 08:47, schrieb Andrzej Zaborowski:
> The SDL check is supposed to set $sdl to "yes" or "no", but with that
> check it leaves $sdl unset on darwin, unless --enable-cocoa was
> specified (which is not needed to enable cocoa anyway).
> 
> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
> ---
>  configure |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 678b982..fb15bc6 100755
> --- a/configure
> +++ b/configure
> @@ -1492,9 +1492,7 @@ EOF
>      if test "$_sdlversion" -lt 121 ; then
>        sdl_too_old=yes
>      else
> -      if test "$cocoa" = "no" ; then
> -        sdl=yes
> -      fi
> +      sdl=yes

With no further explanation in the commit description I have doubts if
this is really "safe". Cocoa actually masquerades as SDL in vl.c and has
no display type of its own, so there may well be a real need to suppress
SDL in the --enable-cocoa case. The #ifdef'fery may need to be sanitized
first, at least fully reviewed.

Also please cc me on Cocoa patches.

Thanks,
Andreas

>      fi
>  
>      # static link with sdl ? (note: sdl.pc's --static --libs is broken)

Patch

diff --git a/configure b/configure
index 678b982..fb15bc6 100755
--- a/configure
+++ b/configure
@@ -1492,9 +1492,7 @@  EOF
     if test "$_sdlversion" -lt 121 ; then
       sdl_too_old=yes
     else
-      if test "$cocoa" = "no" ; then
-        sdl=yes
-      fi
+      sdl=yes
     fi
 
     # static link with sdl ? (note: sdl.pc's --static --libs is broken)