[Gnash-commit] gnash ChangeLog macros/gstreamer.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/25 21:14:03

Modified files:
        .              : ChangeLog 
        macros         : gstreamer.m4 

Log message:
        * macros/gstreamer.m4: look for libgstreamer-0.10.so rather then for 
libgstplaybin.so, fixed handling of --with-gst-libs (was using value given to 
--with-gst-incl instead)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.518&r2=1.519
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -b -r1.518 -r1.519
--- ChangeLog   25 Jul 2006 20:32:47 -0000      1.518
+++ ChangeLog   25 Jul 2006 21:14:03 -0000      1.519
@@ -1,6 +1,9 @@
 2006-07-25 Sandro Santilli <address@hidden>
 
-       * macros/gstreamer.m4: --with-gstreamer => --with-gst
+       * macros/gstreamer.m4: --with-gstreamer => --with-gst,
+         look for libgstreamer-0.10.so rather then for libgstplaybin.so,
+         fixed handling of --with-gst-libs (was using value given to
+         --with-gst-incl instead)
        * libbase/log.cpp: another small optimization.
        * server/ActionExec.cpp: don't call stack dumper
          unless -va is given (another optimization)

Index: macros/gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/gstreamer.m4 25 Jul 2006 20:32:47 -0000      1.11
+++ macros/gstreamer.m4 25 Jul 2006 21:14:03 -0000      1.12
@@ -109,10 +109,10 @@
     AC_ARG_WITH(gst_lib, [  --with-gst-lib         directory where gstreamer 
library is], with_gstreamer_lib=${withval})
       AC_CACHE_VAL(ac_cv_path_gstreamer_lib,[
       if test x"${with_gstreamer_lib}" != x ; then
-        if test -f ${with_gstreamer_lib}/libgstplaybin.so; then
-         ac_cv_path_gstreamer_lib=`(cd ${with_gstreamer_incl}; pwd)`
+        if test -f ${with_gstreamer_lib}/libgstreamer-0.10.so; then
+         ac_cv_path_gstreamer_lib=`(cd ${with_gstreamer_lib}; pwd)`
         else
-         AC_MSG_ERROR([${with_gstreamer_lib} directory doesn't contain 
libgstplaybin.so.])
+         AC_MSG_ERROR([${with_gstreamer_lib} directory doesn't contain 
libgstreamer-0.10.so.])
         fi
       fi
       ])
@@ -128,7 +128,7 @@
         AC_CHECK_LIB(gstreamer-${gnash_gstreamer_version}, gst_plugin_init, 
[ac_cv_path_gstreamer_lib="-lgstreamer-${gnash_gstreamer_version}"],[
           libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
           for i in $libslist; do
-           if test -f 
$i/gstreamer-${gnash_gstreamer_version}/libgstplaybin.so; then
+           if test -f 
$i/gstreamer-${gnash_gstreamer_version}/libgstreamer-0.10.so; then
              if test x"$i" != x"/usr/lib"; then
                ac_cv_path_gstreamer_lib="-L$i 
-lgstreamer-${gnash_gstreamer_version}"
                break
@@ -144,7 +144,7 @@
            fi
           done])
       else
-       if test -f $i/gstreamer-${gnash_gstreamer_version}/libgstplaybin.so; 
then
+       if test -f 
$i/gstreamer-${gnash_gstreamer_version}/libgstreamer-0.10.so; then
           if test x"${ac_cv_path_gstreamer_lib}" != x"/usr/lib"; then
            ac_cv_path_gstreamer_lib="-L${ac_cv_path_gstreamer_lib} 
-lgstreamer-${gnash_gstreamer_version}"
            else