From 23aaf7f3d964b92d2f3edbad2b707f97f50b95c4 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Mon, 19 Nov 2001 02:45:38 +0000
Subject: Add zlib checks. qt build is now zlib dependend (same for rpm spec
 file).

CVS patchset: 1074
CVS date: 2001/11/19 02:45:38
---
 configure.in             | 9 +++++++++
 misc/xine-lib.spec.in    | 4 ++--
 src/demuxers/Makefile.am | 8 ++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index c1cbac264..bc005e3cb 100644
--- a/configure.in
+++ b/configure.in
@@ -374,6 +374,15 @@ AC_CHECK_DXR3()
 AM_CONDITIONAL(HAVE_DXR3, test x"$have_dxr3" = "xyes")
 AM_CONDITIONAL(HAVE_FAME, test x"$have_fame" = "xyes")
 
+
+dnl
+dnl zlib
+dnl
+dnl Test for libz
+AC_CHECK_LIB(z, gzsetparams, AC_CHECK_HEADER(zlib.h,have_zlib=yes,),)
+AM_CONDITIONAL(HAVE_ZLIB, test x"$have_zlib" = "xyes")
+
+
 dnl
 dnl ip_mreqn
 dnl
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index a5dbffb5a..f6aafb155 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -230,8 +230,8 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg_pes.so
 %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg_ts.la
 %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg_ts.so
-%{prefix}/lib/xine/plugins/xineplug_dmx_qt.la
-%{prefix}/lib/xine/plugins/xineplug_dmx_qt.so
+@HAVE_ZLIB_TRUE@%{prefix}/lib/xine/plugins/xineplug_dmx_qt.la
+@HAVE_ZLIB_TRUE@%{prefix}/lib/xine/plugins/xineplug_dmx_qt.so
 # decoder plugins
 %{prefix}/lib/xine/plugins/xineplug_decode_a52.la
 %{prefix}/lib/xine/plugins/xineplug_decode_a52.so
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 57cfac345..1dd074214 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -9,16 +9,20 @@ if HAVE_VORBIS
 ogg_module = xineplug_dmx_ogg.la
 endif
 
+if HAVE_ZLIB
+qt_modules = xineplug_dmx_qt.la
+endif
+
 ##
 # IMPORTANT:
 # ---------
 # All of xine demuxer plugins should be named like the scheme "xineplug_dmx_"
 #
-lib_LTLIBRARIES = $(ogg_module) xineplug_dmx_avi.la \
+lib_LTLIBRARIES = $(ogg_module) $(qt_modules) xineplug_dmx_avi.la \
 	xineplug_dmx_mpeg_block.la xineplug_dmx_mpeg.la \
 	xineplug_dmx_mpeg_elem.la xineplug_dmx_mpeg_audio.la \
 	xineplug_dmx_mpeg_pes.la xineplug_dmx_mpeg_ts.la \
-	xineplug_dmx_qt.la xineplug_dmx_asf.la 
+	xineplug_dmx_asf.la 
 
 xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
 xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@
-- 
cgit v1.2.3