Commit 17dd1f60 authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

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).
parent ddbbd697
2006-09-21 Kristian Høgsberg <krh@redhat.com> 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. * utils/pdftops.cc: Get duplex setting from GlobalParams.
* glib/poppler-page.cc (_poppler_page_new): Make PopplerPage * glib/poppler-page.cc (_poppler_page_new): Make PopplerPage
......
...@@ -69,11 +69,9 @@ if test "$xpdf_cv_func_fseek64" = yes -a "$xpdf_cv_func_ftell64" = yes; then ...@@ -69,11 +69,9 @@ if test "$xpdf_cv_func_fseek64" = yes -a "$xpdf_cv_func_ftell64" = yes; then
fi fi
dnl Test for zlib dnl Test for zlib
AC_ARG_ENABLE(zlib, AC_ARG_ENABLE([zlib],
AC_HELP_STRING([--disable-zlib], [AS_HELP_STRING([--enable-zlib],[Build with zlib])],
[Don't build against zlib.]), [],[enable_zlib="no"])
enable_zlib=$enableval,
enable_zlib="no")
if test x$enable_zlib = xyes; then if test x$enable_zlib = xyes; then
AC_CHECK_LIB([z], [inflate],, AC_CHECK_LIB([z], [inflate],,
AC_MSG_ERROR("*** zlib library not found ***")) AC_MSG_ERROR("*** zlib library not found ***"))
...@@ -264,9 +262,9 @@ AC_ARG_ENABLE(gtk-test, ...@@ -264,9 +262,9 @@ AC_ARG_ENABLE(gtk-test,
enable_gtk_test=$enableval, enable_gtk_test=$enableval,
enable_gtk_test="try") enable_gtk_test="try")
if test x$enable_gtk_test = xyes; then 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 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="yes"],
[enable_gtk_test="no"]) [enable_gtk_test="no"])
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment