configure.ac: If we have libraw1394 >= 1.2.1, then we need libiec61883.

Original commit message from CVS:
2006-06-19  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* configure.ac:
If we have libraw1394 >= 1.2.1, then we need libiec61883.

diff --git a/ChangeLog b/ChangeLog
index 0ccf925..9585879 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-19  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       * configure.ac:
+       If we have libraw1394 >= 1.2.1, then we need libiec61883.
+
 2006-06-18  Edward Hervey  <edward@fluendo.com>
 
        * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_chain): 

diff --git a/configure.ac b/configure.ac
index 636061f..74743dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -547,32 +547,51 @@ GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [
 dnl *** dv1394 ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true)
 GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], 1394, [
-  dnl we need to test three headers and three libs
-  GST_PKG_CHECK_MODULES(RAW1394, libraw1394 >= 1.1.0)
-  GST_CHECK_LIBHEADER(AVC1394,
-    avc1394, avc1394_send_command, $RAW1394_LIBS,
-    libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394")
-  GST_CHECK_LIBHEADER(ROM1394,
-    rom1394, rom1394_free_directory, $RAW1394_LIBS,
-    libavc1394/rom1394.h, ROM1394_LIBS="-lrom1394")
+  dnl first test for libraw1394 >= 1.2.1
+  GST_PKG_CHECK_MODULES(RAW1394, libraw1394 >= 1.2.1)
   GST_PKG_CHECK_MODULES(LIBIEC61883, libiec61883 >= 1.0.0)
   dnl now see how far we got
   if test x$HAVE_RAW1394 = xyes && \
-     test x$HAVE_AVC1394 = xyes && \
-     test x$HAVE_ROM1394 = xyes; then
-       HAVE_DV1394=yes
-       DV1394_LIBS="$RAW1394_LIBS $AVC1394_LIBS $ROM1394_LIBS"
-       DV1394_CFLAGS="$RAW1394_CFLAGS"
-       if test x$HAVE_LIBIEC61883 = xyes; then
-         DV1394_CFLAGS="$RAW1394_CFLAGS $LIBIEC61883_CFLAGS -DHAVE_LIBIEC61883"
-        DV1394_LIBS="$DV1394_LIBS $LIBIEC61883_LIBS"
-       fi
-       AC_SUBST(DV1394_CFLAGS)
-       AC_SUBST(DV1394_LIBS)
+     test x$HAVE_LIBIEC61883 = xyes; then
+       GST_CHECK_LIBHEADER(AVC1394,
+        avc1394, avc1394_send_command, $RAW1394_LIBS,
+       libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394")
+       GST_CHECK_LIBHEADER(ROM1394,
+        rom1394, rom1394_free_directory, $RAW1394_LIBS,
+        libavc1394/rom1394.h, ROM1394_LIBS="-lrom1394")
+       if test x$HAVE_AVC1394 = xyes && \
+          test x$HAVE_AVC1394 = xyes && \
+         test x$HAVE_ROM1394 = xyes; then
+         HAVE_DV1394=yes
+          DV1394_LIBS="$RAW1394_LIBS $AVC1394_LIBS $ROM1394_LIBS $LIBIEC61883_LIBS"
+          DV1394_CFLAGS="$RAW1394_CFLAGS $LIBIEC61883_CFLAGS -DHAVE_LIBIEC61883"
+          AC_SUBST(DV1394_CFLAGS)
+          AC_SUBST(DV1394_LIBS)
+       fi
   else
-       HAVE_DV1394=no
+       if test x$HAVE_RAW1394 = xno; then
+         GST_PKG_CHECK_MODULES(RAW1394, libraw1394 >= 1.1.0)
+         GST_CHECK_LIBHEADER(AVC1394,
+          avc1394, avc1394_send_command, $RAW1394_LIBS,
+          libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394")
+         GST_CHECK_LIBHEADER(ROM1394,
+          rom1394, rom1394_free_directory, $RAW1394_LIBS,
+          libavc1394/rom1394.h, ROM1394_LIBS="-lrom1394")
+          if test x$HAVE_RAW1394 = xyes && \
+            test x$HAVE_AVC1394 = xyes && \
+            test x$HAVE_ROM1394 = xyes; then
+            HAVE_DV1394=yes
+            DV1394_LIBS="$RAW1394_LIBS $AVC1394_LIBS $ROM1394_LIBS"
+            DV1394_CFLAGS="$RAW1394_CFLAGS"
+            if test x$HAVE_LIBIEC61883 = xyes; then
+              DV1394_CFLAGS="$RAW1394_CFLAGS $LIBIEC61883_CFLAGS -DHAVE_LIBIEC61883"
+              DV1394_LIBS="$DV1394_LIBS $LIBIEC61883_LIBS"
+            fi
+             AC_SUBST(DV1394_CFLAGS)
+             AC_SUBST(DV1394_LIBS)
+           fi
+        fi
   fi
-
 ])
 
 dnl *** shout2 ***