[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/09 09:03:35

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        * configure.ac: use better warning messages about SDL sound handling 
and ffmpeg/mad choices.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1079&r2=1.1080
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.134&r2=1.135

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -b -r1.1079 -r1.1080
--- ChangeLog   9 Oct 2006 08:52:12 -0000       1.1079
+++ ChangeLog   9 Oct 2006 09:03:35 -0000       1.1080
@@ -1,5 +1,7 @@
 2006-10-09 Sandro Santilli <address@hidden>
 
+       * configure.ac: use better warning messages about SDL sound handling
+         and ffmpeg/mad choices.
        * configure.ac: fixed refs to the obsoleted --enable-mp3 switch
          and $mp3 variable.
        * configure.ac: GLIB is needed also for GST sound, not only

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- configure.ac        9 Oct 2006 08:52:12 -0000       1.134
+++ configure.ac        9 Oct 2006 09:03:35 -0000       1.135
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.134 2006/10/09 08:52:12 strk Exp $
+dnl $Id: configure.ac,v 1.135 2006/10/09 09:03:35 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -625,25 +625,6 @@
   echo "        Intel 810 LOD bias hack disabled (default). Use 
--enable-i810-lod-bias to enable."
 fi
 
-if test x"$mad" = x"yes"; then
-  echo "        MP3 (libmad) support enabled"
-  if test x"$MAD_LIBS" != x; then
-    if test x"$MAD_CFLAGS" != x; then
-      echo "        MAD flags are: $MAD_CFLAGS"
-    else
-      echo "        MAD flags are: default include path"
-    fi
-    echo "        MAD libs are: $MAD_LIBS"
-  else
-    echo "ERROR: No libmad (mp3) development package installed!\
- You need to have the libmad development package installed\
- to compile this project. You can either reconfigure without --enable-mad,\
- or install libmad0-dev (using apt-get) or libmad (using yum)."
-
-  fi
-else
-  echo "        MP3 (libmad) support disabled (default). Use --enable-mad to 
enable"
-fi
 
 
 if test x"$pthreads" = x"yes"; then
@@ -890,8 +871,25 @@
   fi
 fi
 
-if test "$sound_handler" = "ffmpeg"; then
+if test "$sound_handler" = "sdl"; then
+  if test x"$mad" = x"yes"; then
+    echo "        MP3 support enabled trough libmad"
+    if test x"$MAD_LIBS" != x; then
+      if test x"$MAD_CFLAGS" != x; then
+        echo "        MAD flags are: $MAD_CFLAGS"
+      else
+        echo "        MAD flags are: default include path"
+      fi
+      echo "        MAD libs are: $MAD_LIBS"
+    else
+      echo "WARNING: No libmad (mp3) development package installed!\
+   You need to have the libmad development package installed\
+   to enable mp3 decoding. You can either reconfigure without --enable-mad\
+   to use ffmpeg or install libmad0-dev (using apt-get) or libmad (using yum)."
+    fi
+  else
   if test x"$FFMPEG_LIBS" != x; then
+      echo "        MP3 support enabled trough ffmpeg"
     if test x"$FFMPEG_CFLAGS" != x; then
       echo "        ffmpeg flags are: $FFMPEG_CFLAGS"
     else
@@ -899,8 +897,11 @@
     fi
       echo "        ffmpeg libs are: $FFMPEG_LIBS"
   else
-    echo "ERROR: gstreamer sound requested, but no gstreamer found"
-    nogo=true
+      echo "WARNING: No ffmpeg development package installed!\
+   You need to have the ffmpeg development package installed\
+   to enable mp3 decoding. You can either reconfigure with --enable-mad\
+   to use libmad or install the appropriate ffmpeg packages.".
+    fi
   fi
 fi