[Gnash-commit] gnash configure.ac ChangeLog

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/07 14:49:48

Modified files:
        .              : configure.ac ChangeLog 

Log message:
                * configure.ac: Make absence of ffmpeg or libmad libraries a 
fatal error
                  when they are selected, instead of quietly turning media 
handling off.
                * configure.ac: Fix names of Debian packages required for 
ffmpeg.
                * configure.ac: Fix logic of missing ffmpeg library reporting 
code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.302&r2=1.303
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3118&r2=1.3119

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -b -r1.302 -r1.303
--- configure.ac        6 May 2007 22:57:35 -0000       1.302
+++ configure.ac        7 May 2007 14:49:48 -0000       1.303
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.302 2007/05/06 22:57:35 nihilus Exp $
+dnl $Id: configure.ac,v 1.303 2007/05/07 14:49:48 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -796,13 +796,8 @@
 if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
   if test x"${ac_cv_path_ffmpeg_lib}" = x; then
-    AC_MSG_WARN([ffmpeg specified as decoder but could not be found, disabling 
media handling])
-    media_handler=none
-  else
-    if test x"${ffmpeg_version}" != xok; then
-      AC_MSG_WARN([ffmpeg specified as decoder but it's detected version 
(${ffmpeg_version}) is too old, disabling media handling])
-      media_handler=none
-    fi
+    AC_MSG_WARN([ffmpeg was specified as the media decoder but its library 
could not be found])
+    # configure will abort during final checks
   fi
 fi
 
@@ -811,10 +806,11 @@
   dnl Handles --with-mad-incl and --with-mad-lib
   GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
   if test x"${ac_cv_path_mad_lib}" = x ; then
-    media_handler=none
-    AC_MSG_WARN([Libmad specified as decoder, but it's not present, disabling 
media handling])
+    AC_MSG_WARN([Libmad was specified as the media decoder, but it could not 
be found])
+    # configure will abort during final checks
   fi
 fi
+
 dnl I'm kinda lazy, get rid of this later... //Markus
 AM_CONDITIONAL(HAVE_MAD, test x"$media_handler" = xmad)
 
@@ -1392,26 +1388,27 @@
     fi
   else
     if test x"$media_handler" = x"ffmpeg"; then
+      if test x"$FFMPEG_LIBS" != x; then
+        echo "        MP3 and video support enabled through ffmpeg"
       if test x"${ffmpeg_version}" != xok; then
          echo "        ERROR: You have version ${ffmpeg_version} of ffmpeg 
installed."
          echo "               This version of ffmpeg may not work!"
          echo "               Version 51.27.0 or newer is highly recommended."
         nogo=true
-      fi
-      if test x"$FFMPEG_LIBS" != x; then
-        echo "        MP3 and video support enabled through ffmpeg"
+       else
         if test x"$FFMPEG_CFLAGS" != x; then
           echo "        FFMPEG flags are: $FFMPEG_CFLAGS"
         else
           echo "        FFMPEG flags are: default include path"
         fi
           echo "        FFMPEG libs are: $FFMPEG_LIBS"
+       fi
       else
         echo "        ERROR: No FFMPEG development package installed!"
         echo "               You need to have the ffmpeg development package 
installed"
         echo "               to enable mp3 decoding. You can either 
reconfigure using"
-        echo "               --media-handler=mad to use libmad or install 
libavcodec-dev"
-        echo "               and libdts-dev (using apt-get) or 
<package_names_here> (using yum).".
+        echo "               --media-handler=mad to use libmad or install 
libavformat-dev"
+        echo "               (using apt-get) or <package_names_here> (using 
yum)."
         nogo=true
       fi
     fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3118
retrieving revision 1.3119
diff -u -b -r1.3118 -r1.3119
--- ChangeLog   7 May 2007 14:30:51 -0000       1.3118
+++ ChangeLog   7 May 2007 14:49:48 -0000       1.3119
@@ -1,7 +1,11 @@
-2007-05-03 Martin Guy <address@hidden>
+2007-05-07 Martin Guy <address@hidden>
 
        * backend/sound_handler.h: Fix commentary about RAW and UNCOMPRESSED
          formats.
+       * configure.ac: Make absence of ffmpeg or libmad libraries a fatal error
+         when they are selected, instead of quietly turning media handling off.
+       * configure.ac: Fix names of Debian packages required for ffmpeg.
+       * configure.ac: Fix logic of missing ffmpeg library reporting code.
 
 2007-05-07 Sandro Santilli <address@hidden>