From 3137a1a7b54da179f89a8e1ba3638b0378d6286d Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sat, 25 Jan 2014 09:18:07 +0100
Subject: build: fix usage of HAVE_SDL1 define

This is needed after fd1f8ed49.
---
 audio/out/ao.c | 2 +-
 old-configure  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/out/ao.c b/audio/out/ao.c
index 4530b1c3b7..8f70865afa 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -81,7 +81,7 @@ static const struct ao_driver * const audio_out_drivers[] = {
 #if HAVE_OPENAL
     &audio_out_openal,
 #endif
-#if HAVE_SDL || HAVE_SDL2
+#if HAVE_SDL1 || HAVE_SDL2
     &audio_out_sdl,
 #endif
     &audio_out_null,
diff --git a/old-configure b/old-configure
index b77b1bd8ae..16a43e4d7b 100755
--- a/old-configure
+++ b/old-configure
@@ -2206,7 +2206,7 @@ if test "$_sdl2" = yes ; then
 fi
 if test "$_sdl2" = yes ; then
   _sdl=yes # sdl2 implies sdl
-  def_sdl='#define HAVE_SDL 1'
+  def_sdl='#define HAVE_SDL1 1'
   def_sdl2='#define HAVE_SDL2 1'
   vomodules="sdl $vomodules"
   aomodules="sdl $aomodules"
@@ -2219,11 +2219,11 @@ else
     pkg_config_add 'sdl' && _sdl=yes
   fi
   if test "$_sdl" = yes ; then
-    def_sdl='#define HAVE_SDL 1'
+    def_sdl='#define HAVE_SDL1 1'
     novomodules="sdl $novomodules"
     aomodules="sdl $aomodules"
   else
-    def_sdl='#define HAVE_SDL 0'
+    def_sdl='#define HAVE_SDL1 0'
     novomodules="sdl $novomodules"
     noaomodules="sdl $noaomodules"
   fi
-- 
cgit v1.2.3