From 906187fb002c09e7d2926b633e0c32d836db69f7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Dec 2010 15:56:03 +0900
Subject: [PATCH] Make sure SND_OUTPUT_DEFAULT is always defined.

---
 config.d/build_control.m4 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 5304c2ef9..5290c4a7f 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -290,6 +290,7 @@ AC_SUBST(HAVE_FBDEV)
 AC_SUBST(HAVE_SDL)
 AC_SUBST(HAVE_SVGA)
 
+SND_OUTPUT_DEFAULT=""
 if test -n "$CL_TARGETS"; then
 	CD_TARGETS="libQFcd.la"
 	SND_TARGETS="libQFsound.la"
@@ -327,7 +328,6 @@ if test -n "$CL_TARGETS"; then
 
 	# priority sorted list for default sound driver in order of increasing
 	# priority. default is no driver.
-	SND_OUTPUT_DEFAULT=""
 	if test "`echo $SOUND_TYPES | grep SDL`"; then
 		SND_OUTPUT_DEFAULT="sdl"
 	fi
@@ -352,7 +352,6 @@ if test -n "$CL_TARGETS"; then
 	if test "`echo $SOUND_TYPES | grep ALSA`"; then
 		SND_OUTPUT_DEFAULT="alsa"
 	fi
-	AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.])
 else
 	unset CDTYPE
 	CD_PLUGIN_TARGETS=""
@@ -363,7 +362,7 @@ else
 	SND_TARGETS=""
 	unset SOUND_TYPES
 fi
-AC_SUBST(ALSA_PLUGIN)
+AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.])
 
 SERVER_PLUGIN_TARGETS=""
 if test x$console_need_server = xyes; then