[Gnash-commit] gnash backend/sound_handler_gst.cpp macros/atk....

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/07 22:32:52

Modified files:
        backend        : sound_handler_gst.cpp 
        macros         : atk.m4 ffmpeg.m4 pango.m4 

Log message:
        Fixing typos...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- backend/sound_handler_gst.cpp       7 Oct 2006 14:20:27 -0000       1.19
+++ backend/sound_handler_gst.cpp       7 Oct 2006 22:32:52 -0000       1.20
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.19 2006/10/07 14:20:27 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.20 2006/10/07 22:32:52 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +38,8 @@
 #include <cmath>
 #include <vector>
 
+#define GST_DISABLE_REGISTRY
+#define GST_DISABLE_LOADSAVE
 #include <gst/gst.h>
 
 #define BUFFER_SIZE 5000

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/atk.m4       7 Oct 2006 21:10:20 -0000       1.11
+++ macros/atk.m4       7 Oct 2006 22:32:52 -0000       1.12
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: atk.m4,v 1.11 2006/10/07 21:10:20 nihilus Exp $
+dnl $Id: atk.m4,v 1.12 2006/10/07 22:32:52 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_ATK],
 [
@@ -126,14 +126,17 @@
         if test -f $i/libatk-${gnash_atk_version}.a -o -f 
$i/libatk-${gnash_atk_version}.so; then
           if test x"$i" != x"/usr/lib"; then
             ac_cv_path_atk_lib="-L$i -latk-${gnash_atk_version}"
+            AC_MSG_RESULT(yes)
             break
           else
             ac_cv_path_atk_lib=""
+           AC_MSG_RESULT(no)
             break
           fi
         else
           if test -f $i/libatk-${gnash_atk_version}.a -o -f 
$i/libatk-${gnash_atk_version}.so; then
             ac_cv_path_atk_lib="$i/${gnash_atk_topdir}"
+           AC_MSG_RESULT(yes)
             break
           fi
         fi
@@ -156,10 +159,8 @@
 
   if test x"${ac_cv_path_atk_lib}" != x ; then
     ATK_LIBS="${ac_cv_path_atk_lib}"
-    AC_MSG_RESULT(yes)
   else
     ATK_LIBS=""
-    AC_MSG_RESULT(no)
   fi
 
   AC_SUBST(ATK_CFLAGS)

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/ffmpeg.m4    7 Oct 2006 21:10:20 -0000       1.5
+++ macros/ffmpeg.m4    7 Oct 2006 22:32:52 -0000       1.6
@@ -39,7 +39,7 @@
 dnl date-time, filesystem. graph. iostreams, program options, python,
 dnl regex, serialization, signals, unit test, thead, and wave.
 
-dnl $Id: ffmpeg.m4,v 1.5 2006/10/07 21:10:20 nihilus Exp $
+dnl $Id: ffmpeg.m4,v 1.6 2006/10/07 22:32:52 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -100,7 +100,7 @@
     FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec`
   fi
 
-
+  libn="no"
   if test x"${ac_cv_path_ffmpeg_lib}" = x -a x"$FFMPEG_LIBS" = x ; then
     AC_CHECK_LIB(avcodec, cleanup_slots, [FFMPEG_LIBS="-lavcodec -lavutil"],[
       AC_MSG_CHECKING([for libffmpeg library])
@@ -115,10 +115,14 @@
            ac_cv_path_ffmpeg_lib=""
            FFMPEG_LIBS="-lavcodec -lavutil"
             AC_MSG_RESULT(yes)
+           libn="yes"
            break
           fi
         fi
-      done],
+      done
+      if test x"$libn" != x"yes"; then
+      AC_MSG_RESULT(no)
+      fi],
       [-lavutil])
   else
     if test -f ${ac_cv_path_ffmpeg_lib}/libavcodec.a -o -f 
${ac_cv_path_ffmpeg_lib}/libavcodec.so; then
@@ -131,13 +135,11 @@
     fi
   fi
 
-  if test x"${ac_cv_path_ffmpeg_lib}" != x ; then
+  if test x"${ac_cv_path_ffmpeg_lib}" != x -o x"$libn" = x"yes"; then
     FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec -lavutil"
     AC_DEFINE([USE_FFMPEG],  [1], [Use FFMPEG for MP3 decoding])
-    AC_MSG_RESULT(yes)
   else
     FFMPEG_LIBS=""
-    AC_MSG_RESULT(no)
   fi
 
   AC_SUBST(FFMPEG_CFLAGS)  

Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/pango.m4     13 Aug 2006 12:59:33 -0000      1.14
+++ macros/pango.m4     7 Oct 2006 22:32:52 -0000       1.15
@@ -95,15 +95,14 @@
             fi
           fi
         done
-      fi
-    ])
-  fi
-
-  if test x"${ac_cv_path_pango_incl}" != x; then
+     if test x"${ac_cv_path_pango_incl}" = x; then
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
   fi
+      fi
+    ])
+  fi
 
   dnl Look for the library
   AC_ARG_WITH(pango_lib, [  --with-pango-lib         directory where pango 
library is], with_pango_lib=${withval})