raw1394: Don't compile hdv1394src if libiec61883 isn't available

Fixes #629896

diff --git a/configure.ac b/configure.ac
index b6c4ebebe59c37dea70375c8fea168c60c05ff62..9cf2e5344318c99db36361b4daf41a692afad9b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -864,6 +864,7 @@ AG_GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], 1394, [
         fi
   fi
 ])
+AM_CONDITIONAL(USE_LIBIEC61883, [ test "x${HAVE_LIBIEC61883}" = xyes ] )
 
 dnl *** shout2 ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)

diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am
index 45ec58f5edd2a7c4aef75f1417ba9df369a662fb..ae55f8615517bd699035b8833c990689047c74e3 100644 (file)
--- a/ext/raw1394/Makefile.am
+++ b/ext/raw1394/Makefile.am
@@ -1,7 +1,15 @@
 plugin_LTLIBRARIES = libgst1394.la
 
+if USE_LIBIEC61883
+hdvsource = gsthdv1394src.c
+hdvheaders = gsthdv1394src.h
+else
+hdvsource = 
+hdvheaders = 
+endif
+
 libgst1394_la_SOURCES = \
-       gst1394.c gst1394probe.c gstdv1394src.c gsthdv1394src.c \
+       gst1394.c gst1394probe.c gstdv1394src.c $(hdvsource) \
        gst1394clock.c
 libgst1394_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
@@ -16,6 +24,6 @@ libgst1394_la_LIBADD = \
 libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgst1394_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS = gstdv1394src.h gst1394probe.h gsthdv1394src.h \
+noinst_HEADERS = gstdv1394src.h gst1394probe.h $(hdvheaders) \
        gst1394clock.h
 

diff --git a/ext/raw1394/gst1394.c b/ext/raw1394/gst1394.c
index 87163df3e63daa2ee8e5f2272df8d2851ae9848d..dafeb730ec83ab8f0761a93f6b58d61de18b1972 100644 (file)
--- a/ext/raw1394/gst1394.c
+++ b/ext/raw1394/gst1394.c
@@ -25,7 +25,9 @@
 
 
 #include "gstdv1394src.h"
+#ifdef HAVE_LIBIEC61883
 #include "gsthdv1394src.h"
+#endif
 
 static gboolean
 plugin_init (GstPlugin * plugin)
@@ -33,9 +35,11 @@ plugin_init (GstPlugin * plugin)
   if (!gst_element_register (plugin, "dv1394src", GST_RANK_NONE,
           GST_TYPE_DV1394SRC))
     return FALSE;
+#ifdef HAVE_LIBIEC61883
   if (!gst_element_register (plugin, "hdv1394src", GST_RANK_NONE,
           GST_TYPE_HDV1394SRC))
     return FALSE;
+#endif
 
   return TRUE;
 }