[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/04 17:05:37

Modified files:
        .              : ChangeLog configure.ac 

Log message:
                * configure.ac: rewording of ffmpeg warnings. Shows a bug in 
ffmpeg.m4
                  failing to detect version and thus failing to accept it when
                  passed explicit --with-ffmpeg-incl and --with-ffmpeg-lib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3092&r2=1.3093
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.300&r2=1.301

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3092
retrieving revision 1.3093
diff -u -b -r1.3092 -r1.3093
--- ChangeLog   4 May 2007 15:20:59 -0000       1.3092
+++ ChangeLog   4 May 2007 17:05:37 -0000       1.3093
@@ -1,5 +1,8 @@
 2007-05-03 Sandro Santilli <address@hidden>
 
+       * configure.ac: rewording of ffmpeg warnings. Shows a bug in ffmpeg.m4
+         failing to detect version and thus failing to accept it when
+         passed explicit --with-ffmpeg-incl and --with-ffmpeg-lib.
        * server/asobj/: NetStream.{cpp,h},
          NetStreamFfmpeg.cpp, NetStreamGst.cpp:
          Use an enum for status codes, avoid notifying multiple

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -b -r1.300 -r1.301
--- configure.ac        2 May 2007 19:33:06 -0000       1.300
+++ configure.ac        4 May 2007 17:05:37 -0000       1.301
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.300 2007/05/02 19:33:06 martinwguy Exp $
+dnl $Id: configure.ac,v 1.301 2007/05/04 17:05:37 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -792,9 +792,14 @@
 
 if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
-  if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version}" != xok; then
-    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present or it's 
version is too old, disabling media handling])
+  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
   fi
 fi