diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-04-15 18:45:24 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-04-15 18:45:24 -0400 |
| commit | 9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c (patch) | |
| tree | d2a207b07ae2cedae0ba2f4d007fa7be405b2fb7 /configure.in | |
| parent | dff1f2b0d6c353f0839a7a38115c69cd915f9cbd (diff) | |
| parent | 08fd5cf33d875c161dd5280b92d1633469943620 (diff) | |
| download | pango-9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
pango/opentype/hb-buffer-private.h
pango/opentype/hb-buffer.c
pango/opentype/hb-buffer.h
pango/opentype/hb-open-type-private.hh
pango/opentype/hb-ot-layout-gpos-private.hh
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b24c4a75..8850e743 100644 --- a/configure.in +++ b/configure.in @@ -451,7 +451,7 @@ fi # # Checks for GLib # -GLIB_REQUIRED_VERSION=2.17.3 +GLIB_REQUIRED_VERSION=2.26.0 GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0" PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :, @@ -486,7 +486,7 @@ PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=tr # Checks for GObject Introspection # -GOBJECT_INTROSPECTION_CHECK([0.6.14]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) # # Modules to build |