[totem-pl-parser] Check for zlib and link with it

[Sebastian Dröge <sdroege src gnome org>]

commit c99aa5efb2813e2f3616f0374910b941a859d010
Author: Sebastian Dröge <sebastian droege collabora co uk>
Date:   Tue May 4 17:42:53 2010 +0200

    Check for zlib and link with it

 configure.in        |    6 ++++++
 plparse/Makefile.am |    4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1b3a1fd..82c15cb 100644
--- a/configure.in
+++ b/configure.in
@@ -106,6 +106,12 @@ PKG_CHECK_MODULES(TOTEM_PLPARSER, [$pkg_modules])
 AC_SUBST(TOTEM_PLPARSER_CFLAGS)
 AC_SUBST(TOTEM_PLPARSER_LIBS)
 
+dnl Check for zlib
+oldLibs=$LIBS
+AC_CHECK_HEADER(zlib.h, , AC_ERROR([zlib development headers are required to compile totem-pl-parser]))
+AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib development headers are required to compile totem-pl-parser]))
+LIBS=$oldLibs
+
 PKG_CHECK_MODULES([TOTEM_PLPARSER_MINI], [gio-2.0])
 
 GNOME_COMMON_INIT
diff --git a/plparse/Makefile.am b/plparse/Makefile.am
index 908de30..6dd74da 100644
--- a/plparse/Makefile.am
+++ b/plparse/Makefile.am
@@ -70,7 +70,6 @@ libtotem_plparser_la_CPPFLAGS = \
 
 libtotem_plparser_la_CFLAGS = \
 	$(TOTEM_PLPARSER_CFLAGS)	\
-	$(HAL_CFLAGS)			\
 	$(DBUS_CFLAGS)			\
 	$(WARN_CFLAGS)			\
 	$(AM_CFLAGS)			\
@@ -82,7 +81,7 @@ libtotem_plparser_la_CFLAGS = \
 libtotem_plparser_la_LIBADD = \
 	$(TOTEM_PLPARSER_LIBS)			\
 	$(top_builddir)/lib/libtotem_glibc.la	\
-	$(HAL_LIBS)
+	-lz
 
 libtotem_plparser_la_LDFLAGS =			\
 	-version-info $(PLPARSER_LT_VERSION)	\
@@ -188,7 +187,6 @@ TotemPlParser_1_0_gir_SCANNERFLAGS = --namespace=TotemPlParser --strip-prefix=To
 TotemPlParser_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 TotemPlParser_1_0_gir_CFLAGS = \
 	$(TOTEM_PLPARSER_CFLAGS)	\
-	$(HAL_CFLAGS)			\
 	$(DBUS_CFLAGS)			\
 	$(AM_CFLAGS)			\
 	-D_FILE_OFFSET_BITS=64		\