gnome-games r7114 - trunk

[andreasr svn gnome org]

Author: andreasr
Date: Sun Jan  6 21:02:51 2008
New Revision: 7114
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7114&view=rev

Log:
Correct check for missing SDL_Mixer


Modified:
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan  6 21:02:51 2008
@@ -415,7 +415,7 @@
 AM_CONDITIONAL([WITH_GTHREAD],[test "$need_gthread" = "yes"])
 
 # Sound support: GStreamer and SDL_mixer
-
+# FIXME: The logic here could probably be cleaned up a bit.
 have_gstreamer=no
 if test "$enable_sound" = "yes"; then
 
@@ -429,8 +429,8 @@
       [have_gstreamer=yes],[have_gstreamer=no])
 
     # SDL_mixer is default, while GStreamer is a required dependency if SDL_mixer isn't found.
-    if test "$enable_sound" = "yes" -a "$have_gstreamer" = "no"; then
-      AC_MSG_ERROR([Sound enabled but GStreamer not found])
+    if test "$enable_sound" = "yes" -a "$have_gstreamer" = "no" -a "x$SDL_mixer" = "no"; then
+      AC_MSG_ERROR([Sound enabled but GStreamer or SDL_Mixer not found])
     fi
   fi