2006-09-21  Kristian Høgsberg  <krh@redhat.com>

	* configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
	help text for zlib option (#7788, #7661).
diff --git a/ChangeLog b/ChangeLog
index a65a88a..584a90f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-21  Kristian Høgsberg  <krh@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
diff --git a/configure.ac b/configure.ac
index 898a7e4..4745832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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