From 5d78ae0a1c34b888b87ae64f7e188860816c7e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Fri, 5 Jan 2007 17:23:04 +0000
Subject: [PATCH] gst/matroska/Makefile.am: If zlib is available and used, we
 must link it explicitly for things to work on MingW (fixe...

Original commit message from CVS:
* gst/matroska/Makefile.am:
If zlib is available and used, we must link it explicitly for
things to work on MingW (fixes #392855).
---
 ChangeLog                | 6 ++++++
 gst/matroska/Makefile.am | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f9d8279775..a3d8d9a02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-05  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/matroska/Makefile.am:
+	  If zlib is available and used, we must link it explicitly for
+	  things to work on MingW (fixes #392855).
+
 2007-01-04  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/esd/esdsink.c: (gst_esdsink_delay):
diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 87e3d9e660..21dbb514c9 100644
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -25,5 +25,6 @@ libgstmatroska_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS) \
-	-lgstriff-@GST_MAJORMINOR@
+	-lgstriff-@GST_MAJORMINOR@ \
+	$(ZLIB_LIBS)
 libgstmatroska_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)