fix the build

Original commit message from CVS:
fix the build

diff --git a/ChangeLog b/ChangeLog
index 01a466d..8edd53f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * configure.ac:
+       * ext/Makefile.am:
+       * ext/raw1394/Makefile.am:
+         fix the build
+
 2004-10-20  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * ext/ogg/gstoggdemux.c: (gst_ogg_demux_iterate):

diff --git a/configure.ac b/configure.ac
index 4456264..d018daa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1382,11 +1382,30 @@ GST_CHECK_FEATURE(PANGO, [pango], pango, [
   AC_SUBST(PANGO_LIBS)
 ])
 
-dnl *** raw1394 ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_RAW1394, true)
-GST_CHECK_FEATURE(RAW1394, [raw1394 library], dv1394src, [
-  GST_CHECK_LIBHEADER(RAW1394, raw1394, raw1394_new_handle,, libraw1394/raw1394.h, RAW1394_LIBS="-lraw1394")
-  AC_SUBST(RAW1394_LIBS)
+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")
+  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 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"
+       AC_SUBST(DV1394_LIBS)
+  else
+       HAVE_DV1394=no
+  fi
 ])
 
 dnl *** SDL ***

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 2c1a7d8..14e9618 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -256,10 +256,10 @@ else
 PANGO_DIR=
 endif
 
-if USE_RAW1394
-RAW1394_DIR=raw1394
+if USE_DV1394
+DV1394_DIR=raw1394
 else
-RAW1394_DIR=
+DV1394_DIR=
 endif
 
 if USE_SDL