[gst-cvs] zaheer gst-plugins-good: gst-plugins-good/

[<za...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     zaheer
Date:           Wed Jun 07 2006  09:25:28 UTC

Log message:
2006-06-07  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
        * configure.ac:
        We now require libraw1394 >= 1.1.0 and that version onwards all
        have .pc files.

Modified files:
    .               : ChangeLog configure.ac

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2375&r2=1.2376
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/configure.ac.diff?r1=1.659&r2=1.660

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.2375
retrieving revision 1.2376
diff -u -d -r1.2375 -r1.2376
--- ChangeLog	2 Jun 2006 15:02:53 -0000	1.2375
+++ ChangeLog	7 Jun 2006 09:25:16 -0000	1.2376
@@ -1,3 +1,9 @@
+2006-06-07  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* configure.ac:
+	We now require libraw1394 >= 1.1.0 and that version onwards all
+	have .pc files.
 2006-06-02  Edward Hervey  <ed...@fl...>
 
 	* gst/law/alaw-decode.c: (alawdec_getcaps): 
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-good/configure.ac,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -d -r1.659 -r1.660
--- configure.ac	31 May 2006 10:31:23 -0000	1.659
+++ configure.ac	7 Jun 2006 09:25:16 -0000	1.660
@@ -573,9 +573,8 @@
 translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true)
 GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [
   dnl we need to test three headers and three libs
-  GST_CHECK_LIBHEADER(RAW1394,
-    raw1394, raw1394_new_handle,,
-    libraw1394/raw1394.h, RAW1394_LIBS="-lraw1394")
+  PKG_CHECK_MODULES(RAW1394,
+    libraw1394 >= 1.1.0, HAVE_RAW1394="yes", HAVE_RAW1394="no")
   GST_CHECK_LIBHEADER(AVC1394,
     avc1394, avc1394_send_command, $RAW1394_LIBS,
     libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394")
@@ -590,9 +589,9 @@
      test x$HAVE_ROM1394 = xyes; then
        HAVE_DV1394=yes
        DV1394_LIBS="$RAW1394_LIBS $AVC1394_LIBS $ROM1394_LIBS"
-       DV1394_CFLAGS=""
+       DV1394_CFLAGS="$RAW1394_CFLAGS"
        if test x$HAVE_LIBIEC61883 = xyes; then
-         DV1394_CFLAGS="$LIBIEC61883_CFLAGS -DHAVE_LIBIEC61883"
+         DV1394_CFLAGS="$RAW1394_CFLAGS $LIBIEC61883_CFLAGS -DHAVE_LIBIEC61883"
 	 DV1394_LIBS="$DV1394_LIBS $LIBIEC61883_LIBS"
        fi
        AC_SUBST(DV1394_CFLAGS)