summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-08-22 16:04:02 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-08-22 16:04:02 +0000
commit1e10b33f15e928ff7ea80c05213be2a54f6ede0c (patch)
tree853b51ef1c5adeef42e1daeb91969f08c1542c15
parent42998c9438cee485f9a9f5d3ed1c0be1d5ab4840 (diff)
gst/autodetect/Makefile.am: Don't link the autodetect plugin with GConf as it doesn't use GConf. Fixes bug #545463.
Original commit message from CVS: * gst/autodetect/Makefile.am: Don't link the autodetect plugin with GConf as it doesn't use GConf. Fixes bug #545463.
-rw-r--r--ChangeLog6
-rw-r--r--gst/autodetect/Makefile.am4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c4e9b24e..629990ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-08-22 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * gst/autodetect/Makefile.am:
+ Don't link the autodetect plugin with GConf as it doesn't
+ use GConf. Fixes bug #545463.
+
+2008-08-22 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
* gst/matroska/ebml-read.c: (gst_ebml_read_element_id),
(gst_ebml_read_element_length), (gst_ebml_read_uint),
(gst_ebml_read_sint), (gst_ebml_read_float),
diff --git a/gst/autodetect/Makefile.am b/gst/autodetect/Makefile.am
index 7c73402f..1ecd9ce2 100644
--- a/gst/autodetect/Makefile.am
+++ b/gst/autodetect/Makefile.am
@@ -4,8 +4,8 @@ libgstautodetect_la_SOURCES = \
gstautoaudiosink.c \
gstautodetect.c \
gstautovideosink.c
-libgstautodetect_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
-libgstautodetect_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
+libgstautodetect_la_CFLAGS = $(GST_CFLAGS)
+libgstautodetect_la_LIBADD = $(GST_LIBS)
libgstautodetect_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \