[Gnash-commit] /srv/bzr/gnash/trunk r11524: Don't use the version number in the path for pbutils.

[Rob Savoye]

------------------------------------------------------------
revno: 11524
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2009-09-24 15:02:22 -0600
message:
  Don't use the version number in the path for pbutils.
modified:
  configure.ac
  libmedia/gst/GstUtil.cpp

=== modified file 'configure.ac'
--- a/configure.ac      2009-09-24 16:32:22 +0000
+++ b/configure.ac      2009-09-24 21:02:22 +0000
@@ -2006,7 +2006,7 @@
   dnl the codec installer to download the package to install, so disable
   dnl it if cross compiling with gstreamer support.
   if test x$cross_compiling = xno; then
-    GNASH_PKG_FIND(gstpbutils, [gstreamer-0.10/gst/pbutils/install-plugins.h], 
[gstreamer PB Utils library], gst_install_plugins_supported, [0.10])
+    GNASH_PKG_FIND(gstpbutils, [gst/pbutils/install-plugins.h], [gstreamer PB 
Utils library], gst_install_plugins_supported, [0.10])
   fi
   dnl when cross compiling Gstreamer, not all supplied SDKs include all the
   dnl development libraries since most devices don't need to support plugin

=== modified file 'libmedia/gst/GstUtil.cpp'
--- a/libmedia/gst/GstUtil.cpp  2009-07-24 20:42:41 +0000
+++ b/libmedia/gst/GstUtil.cpp  2009-09-24 21:02:22 +0000
@@ -29,11 +29,11 @@
 
 #include "swfdec_codec_gst.h"
 
-#ifdef HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
+#ifdef HAVE_GST_PBUTILS_INSTALL_PLUGINS_H
 #include <gst/pbutils/pbutils.h>
 #include <gst/pbutils/missing-plugins.h>
 #include <gst/pbutils/install-plugins.h>
-#endif // HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
+#endif // HAVE_GST_PBUTILS_INSTALL_PLUGINS_H
 
 
 namespace gnash {
@@ -107,7 +107,7 @@
         return true;
     }
 
-#ifdef HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
+#ifdef HAVE_GST_PBUTILS_INSTALL_PLUGINS_H
     gst_pb_utils_init();
 
 
@@ -140,7 +140,7 @@
 #else
     log_error(_("Missing plugin, but automatic plugin installation not "
                 "available."));
-#endif  // end of HAVE_GSTREAMER_0_10_GST_PBUTILS_INSTALL_PLUGINS_H
+#endif  // end of HAVE_GST_PBUTILS_INSTALL_PLUGINS_H
 
     return false;
 }