diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 9 |
3 files changed, 10 insertions, 5 deletions
@@ -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 <edward@fluendo.com> * gst/law/alaw-decode.c: (alawdec_getcaps): diff --git a/common b/common -Subproject 80b4e2c08717159760ebaa40715f8919b3f77ba +Subproject 5d58e7652bf38a637dceca167d6e47e7794b2b5 diff --git a/configure.ac b/configure.ac index de44ceed..c9eaeb0c 100644 --- a/configure.ac +++ b/configure.ac @@ -573,9 +573,8 @@ dnl *** dv1394 *** 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 @@ GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [ 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) |