[poppler] poppler: ChangeLog,1.71,1.72 configure.ac,1.17,1.18

[Jeff Muizelaar]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv21581

Modified Files:
	ChangeLog configure.ac 
Log Message:
2005-04-27  Jeff Muizelaar  <jeff at infidigm.net>

	* configure.ac:
	* poppler/FlateStream.cc:
	* poppler/FlateStream.h:
	* poppler/Makefile.am:
	* poppler/Stream.cc:
	* poppler/Stream.h: Add a reimplementation of FlateStream using
	zlib.


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- ChangeLog	27 Apr 2005 18:53:20 -0000	1.71
+++ ChangeLog	27 Apr 2005 20:56:18 -0000	1.72
@@ -1,3 +1,13 @@
+2005-04-27  Jeff Muizelaar  <jeff at infidigm.net>
+
+	* configure.ac:
+	* poppler/FlateStream.cc:
+	* poppler/FlateStream.h:
+	* poppler/Makefile.am:
+	* poppler/Stream.cc:
+	* poppler/Stream.h: Add a reimplementation of FlateStream using
+	zlib.
+
 2005-04-27  Kristian Høgsberg  <krh at redhat.com>
 
 	* poppler/Catalog.cc (NameTree::lookup): Fix bsearch return value

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- configure.ac	23 Apr 2005 00:09:05 -0000	1.17
+++ configure.ac	27 Apr 2005 20:56:18 -0000	1.18
@@ -82,6 +82,34 @@
   AC_DEFINE(HAVE_FSEEK64)
 fi
 
+dnl Test for zlib
+AC_ARG_ENABLE(zlib,
+	      AC_HELP_STRING([--disable-zlib],
+	                     [Don't build against zlib.]),
+              enable_zlib=$enableval,
+              enable_zlib="try")
+if test x$enable_zlib = xyes; then
+  AC_CHECK_LIB([z], [inflate],,
+	       AC_MSG_ERROR("*** zlib library not found ***"))
+  AC_CHECK_HEADERS([zlib.h],,
+		   AC_MSG_ERROR("*** zlib headers not found ***"))
+elif test x$enable_zlib = xtry; then
+  AC_CHECK_LIB([z], [inflate],
+               [enable_zlib="yes"],
+	       [enable_zlib="no"])
+  AC_CHECK_HEADERS([zlib.h],,
+		   [enable_zlib="no"])
+fi
+
+if test x$enable_zlib = xyes; then
+  ZLIB_LIBS="-lz"
+  AC_SUBST(ZLIB_LIBS)
+  AC_DEFINE(ENABLE_ZLIB)
+fi
+
+AM_CONDITIONAL(BUILD_ZLIB, test x$enable_zlib = xyes)
+AH_TEMPLATE([ENABLE_ZLIB],
+	    [Use zlib instead of builtin zlib decoder.])
 
 dnl Test for libjpeg
 AC_ARG_ENABLE(libjpeg,
@@ -314,3 +342,4 @@
 echo "  qt wrapper:    $enable_poppler_qt"
 echo "  glib wrapper:  $enable_poppler_glib"
 echo "  use libjpeg:   $enable_libjpeg"
+echo "  use zlib:      $enable_zlib"