Bug 511163 – Remove pango_extents_to_pixels() calls

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 45eb392beababb4b01e44e92403707d156b0839f..16eeb5614ee88ac7809e68fb1388da0cc6436f92 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,9 +32,9 @@ m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
 m4_define([glib_required_version], [2.15.0])
-m4_define([pango_required_version], [1.19.3])
+m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.13.0])
-m4_define([cairo_required_version], [1.2.0])
+m4_define([cairo_required_version], [1.6])
 
 
 AC_INIT([gtk+], [gtk_version],
@@ -147,7 +147,7 @@ dnl
 dnl Check for a working C++ compiler, but do not bail out, if none is found.
 dnl We use this for an automated test for C++ header correctness.
 dnl 
-AC_CHECK_PROGS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
+AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 
@@ -1674,7 +1674,7 @@ else
         LIBS="$gtk_save_LIBS"
 fi
 
-GTK_PACKAGES="atk cairo"
+GTK_PACKAGES="atk cairo gio-2.0"
 GTK_EXTRA_LIBS=
 GTK_EXTRA_CFLAGS= 
 GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"