[poppler] poppler: ChangeLog,1.432,1.433 configure.ac,1.64,1.65

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv24138

Modified Files:
	ChangeLog configure.ac 
Log Message:
2006-09-21  Kristian Høgsberg  <krh at redhat.com>

	* configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
	help text for zlib option (#7788, #7661).



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -d -r1.432 -r1.433
--- ChangeLog	21 Sep 2006 22:58:31 -0000	1.432
+++ ChangeLog	21 Sep 2006 23:28:14 -0000	1.433
@@ -1,5 +1,8 @@
 2006-09-21  Kristian Høgsberg  <krh at redhat.com>
 
+	* configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
+	help text for zlib option (#7788, #7661).
+
 	* utils/pdftops.cc: Get duplex setting from GlobalParams.
 
 	* glib/poppler-page.cc (_poppler_page_new): Make PopplerPage

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- configure.ac	21 Sep 2006 01:05:23 -0000	1.64
+++ configure.ac	21 Sep 2006 23:28:14 -0000	1.65
@@ -69,11 +69,9 @@
 fi
 
 dnl Test for zlib
-AC_ARG_ENABLE(zlib,
-	      AC_HELP_STRING([--disable-zlib],
-	                     [Don't build against zlib.]),
-              enable_zlib=$enableval,
-              enable_zlib="no")
+AC_ARG_ENABLE([zlib],
+  [AS_HELP_STRING([--enable-zlib],[Build with zlib])],
+  [],[enable_zlib="no"])
 if test x$enable_zlib = xyes; then
   AC_CHECK_LIB([z], [inflate],,
 	       AC_MSG_ERROR("*** zlib library not found ***"))
@@ -264,9 +262,9 @@
               enable_gtk_test=$enableval,
               enable_gtk_test="try")
 if test x$enable_gtk_test = xyes; then
-  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.2.0 gdk-pixbuf-2.0 libglade-2.0)
+  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.8.0 gdk-pixbuf-2.0 libglade-2.0)
 elif test x$enable_gtk_test = xtry; then
-  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.2.0 gdk-pixbuf-2.0 libglade-2.0,
+  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.8.0 gdk-pixbuf-2.0 libglade-2.0,
                     [enable_gtk_test="yes"],
                     [enable_gtk_test="no"])
 fi