diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2010-10-04 22:31:32 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2010-10-04 22:31:32 +0200 |
| commit | 9481c8a1a00f8eda5654f110c84d36d67ca964d2 (patch) | |
| tree | 2858b5f684849e00d03f7b3b11a93fd0029f1cda | |
| parent | 4c2f5333bbd1766bfb1a3ce30a5ca34195e323d7 (diff) | |
raw1394: Don't compile hdv1394src if libiec61883 isn't available
Fixes #629896
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ext/raw1394/Makefile.am | 12 | ||||
| -rw-r--r-- | ext/raw1394/gst1394.c | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b6c4ebebe..9cf2e5344 100644 --- 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 45ec58f5e..ae55f8615 100644 --- 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 87163df3e..dafeb730e 100644 --- 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; } |