[gst-cvs] christianmeyer gst-bind: gst-bind/c++/

[Christian M. <chr...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gst-bind
Changes by:     christianmeyer
Date:           Thu Mar 13 2003  09:24:36 PST

Log message:
Seems like the last commit didn't work, sigh

Modified files:
    c++             : ChangeLog configure.in

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-bind/c%2b%2b/ChangeLog.diff?r1=1.18&r2=1.19
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-bind/c%2b%2b/configure.in.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gstreamer/gst-bind/c++/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	13 Mar 2003 16:52:57 -0000	1.18
+++ ChangeLog	13 Mar 2003 17:24:23 -0000	1.19
@@ -1,3 +1,13 @@
+2003-03-13  Christian Meyer  <chr...@gn...>
+
+	* gst/src/element.{ccg,hg}: operator<<() throws an std::exception now.
+
+2003-03-12  Christian Meyer  <chr...@gn...>
+
+	* configure.in: Checking for gstreamer.pc and gstreamer-0.6.pc now.
+	                gstreamer >= 0.6 is required now.
+	* gst/src/pad.hg: Fixed typo in set_parent s/Elemet/Element.
+
 2003-03-13  Martin Schulze  <MHL...@t-...>
 
 	* gst/src/props.ccg: Bugfix.
Index: configure.in
===================================================================
RCS file: /cvsroot/gstreamer/gst-bind/c++/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.in	13 Mar 2003 15:01:00 -0000	1.3
+++ configure.in	13 Mar 2003 17:24:24 -0000	1.4
@@ -68,7 +68,7 @@
 AM_PROG_LIBTOOL
 
 AL_PROG_GNU_M4(AC_MSG_ERROR([dnl
-SUN m4 does not work for building gtkmm. 
+SUN m4 does not work for building gtkmm.
 Please install GNU m4.]))
 
 AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
@@ -82,7 +82,15 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
-PKG_CHECK_MODULES(GSTMM, glibmm-2.0 >= 2.0.0 gstreamer-0.6 >= 0.6.0)
+dnl Check whether there's gstreamer.pc or gstreamer-0.6.pc
+HAVE_GSTMM=no
+PKG_CHECK_MODULES(GSTMM, glibmm-2.0 >= 2.0.0 gstreamer >= 0.6.0,
+                  HAVE_GSTMM=yes, HAVE_GSTMM=no)
+if test "x$HAVE_GSTMM" = "xno"; then
+  PKG_CHECK_MODULES(GSTMM, glibmm-2.0 >= 2.0.0 gstreamer-0.6 >= 0.6.0,
+                    HAVE_GSTMM=yes, HAVE_GSTMM=no)
+fi
+
 AC_SUBST(GSTMM_CFLAGS)
 AC_SUBST(GSTMM_LIBS)
 
@@ -141,6 +149,6 @@
 
 	docs/Makefile
 	docs/reference/Makefile
-    docs/reference/Doxyfile
+	docs/reference/Doxyfile
 ])