ekiga r7094 - in trunk: . lib/engine/components/gstreamer

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Sep 25 16:51:35 2008
New Revision: 7094
URL: http://svn.gnome.org/viewvc/ekiga?rev=7094&view=rev

Log:
Fixed bug #553457.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/components/gstreamer/Makefile.am
   trunk/lib/engine/components/gstreamer/gst-videoinput.cpp

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Sep 25 16:51:35 2008
@@ -510,7 +510,21 @@
 AC_ARG_ENABLE(gstreamer, [  --enable-gstreamer            Enable GStreamer support],enable_gstreamer=yes,)
 
 if test "x$enable_gstreamer" = "xyes"; then
-  PKG_CHECK_MODULES([GSTREAMER], [gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10], [found_gstreamer=yes])
+  found_gstreamer=yes
+  PKG_CHECK_MODULES([GSTREAMER], [gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10])
+  CPPFLAGS_save="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
+  AC_CHECK_HEADER(gst/app/gstappsink.h,,found_gstreamer=no)
+  CPPFLAGS="$CPPFLAGS_save"
+  LIBS_save="$LIBS"
+  LIBS="$LIBS $GSTREAMER_LIBS"
+  AC_CHECK_LIB(gstapp-0.10,gst_app_sink_pull_buffer,,found_gstreamer=no)
+  LIBS="$LIBS_save"
+
+  if test "x$found_gstreamer" = "xno"; then
+    AC_MSG_ERROR([You asked for GStreamer, but we didn't find what we need])
+  fi
+  GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstapp-0.10"
   AC_SUBST(GSTREAMER_CFLAGS)
   AC_SUBST(GSTREAMER_LIBS)
   GSTREAMER="enabled"

Modified: trunk/lib/engine/components/gstreamer/Makefile.am
==============================================================================
--- trunk/lib/engine/components/gstreamer/Makefile.am	(original)
+++ trunk/lib/engine/components/gstreamer/Makefile.am	Thu Sep 25 16:51:35 2008
@@ -17,4 +17,4 @@
 	$(gstreamer_dir)/gst-videoinput.h \
 	$(gstreamer_dir)/gst-videoinput.cpp
 
-libgmgstreamer_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GSTREAMER_LIBS) -lgstapp-0.10 $(PTLIB_LIBS)
+libgmgstreamer_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)

Modified: trunk/lib/engine/components/gstreamer/gst-videoinput.cpp
==============================================================================
--- trunk/lib/engine/components/gstreamer/gst-videoinput.cpp	(original)
+++ trunk/lib/engine/components/gstreamer/gst-videoinput.cpp	Thu Sep 25 16:51:35 2008
@@ -27,7 +27,7 @@
 
 
 /*
- *                         gst-videoinput.h  -  description
+ *                         gst-videoinput.cpp  -  description
  *                         ------------------------------------
  *   begin                : Wed 17 September 2008
  *   copyright            : (C) 2008 by Julien Puydt