[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/26 14:18:14

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        * configure.ac: don't complain about missing SDL_Mixer if Gstreamer 
sound is requested

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.526&r2=1.527
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -b -r1.526 -r1.527
--- ChangeLog   26 Jul 2006 11:56:34 -0000      1.526
+++ ChangeLog   26 Jul 2006 14:18:14 -0000      1.527
@@ -1,3 +1,9 @@
+
+2006-07-26 Sandro Santilli <address@hidden>
+
+       * configure.ac: don't complain about missing SDL_Mixer
+         if Gstreamer sound is requested
+
 2006-07-26 Vitaly Alexeev <address@hidden>
 
        * server/movie_def_impl.cpp: fixing bug #17110

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- configure.ac        26 Jul 2006 01:33:27 -0000      1.92
+++ configure.ac        26 Jul 2006 14:18:14 -0000      1.93
@@ -197,8 +197,8 @@
 AC_ARG_ENABLE(
  sound,
  [  --enable-sound=handler Specify sound handler:
-                                 GST
-                                 SDL ],
+                                 GST (Gstreamer)
+                                 SDL (SDL_Mixer - default)],
  [case "${enableval}" in
    GST|gst) sound_handler=gst ;;
    sdl|SDL) sound_handler=sdl  ;;
@@ -731,11 +731,11 @@
 if test "$sound_handler" = "gst"; then
   if test x"$GSTREAMER_LIBS" != x; then
     if test x"$GSTREAMER_CFLAGS" != x; then
-      echo "        GSTREAMER flags are: $GSTREAMER_CFLAGS"
+      echo "        Gstreamer flags are: $GSTREAMER_CFLAGS"
     else
-      echo "        GSTREAMER flags are: default include path"
+      echo "        Gstreamer flags are: default include path"
     fi
-      echo "        GSTREAMER libs are: $GSTREAMER_LIBS"
+      echo "        Gstreamer libs are: $GSTREAMER_LIBS"
   else
     echo "WARNING: gstreamer sound requested, but no gstreamer found"
     nogo=true
@@ -821,25 +821,17 @@
     nogo=true
 fi
 
-if test x"$SDL_MIXER_LIBS" != x; then
+if test "$sound_handler" = "sdl"; then
+  if test x"$SDL_MIXER_LIBS" != x; then
     echo "        SDL_Mixer flags are: $SDL_MIXER_CFLAGS"
     echo "        SDL_Mixer libs are: $SDL_MIXER_LIBS"
-else
+  else
     echo "WARNING: No SDL_Mixer development package installed!\
  You need to have the SDL Mixer development package installed\
  if you wish to have MP3 support for Gnash.\
  To compile this project with SDL sound support, install\
  libsdl-mixer1.2-dev (using apt-get) or SDL_mixer-devel (using yum)."
-fi
-
-dnl As the GStreamer support isn't used, but is to support a
-dnl work-in-progress, we don't want to confuse people by printing a
-dnl warning if it's not installed.
-if test x"$GSTREAMER_LIBS" != x; then
-    echo "        Gstreamer flags are: $GSTREAMER_CFLAGS"
-    echo "        Gstreamer libs are: $GSTREAMER_LIBS"
-dnl else
-dnl     echo "ERROR: No Gstreamer development package installed!."
+  fi
 fi
 
 if test x"$plugin" = x"yes"; then