diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-08-21 20:51:24 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-08-21 20:51:24 -0500 |
| commit | a0631d307fabab4ea0fb27104fb30af5013fafa4 (patch) | |
| tree | e3876bacc38d0621bb4898bd48ab58559658027f /configure.ac | |
| parent | 2a3f56b5168e9745547d2289c0710ae606920cde (diff) | |
| parent | d4f4fa39b6cb87f0658f727a100eb913c74478ee (diff) | |
| download | ayatana-ido-a0631d307fabab4ea0fb27104fb30af5013fafa4.tar.gz ayatana-ido-a0631d307fabab4ea0fb27104fb30af5013fafa4.tar.bz2 ayatana-ido-a0631d307fabab4ea0fb27104fb30af5013fafa4.zip | |
merge lp:~charlesk/ido/switch to add GtkSwitchMenuItem
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6e350b9..0ef71bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ # # shamelessly stolen from clutter-gtk # -m4_define([ido_major_version], [0]) -m4_define([ido_minor_version], [3]) -m4_define([ido_micro_version], [4]) +m4_define([ido_major_version], [12]) +m4_define([ido_minor_version], [10]) +m4_define([ido_micro_version], [0]) m4_define([ido_api_version], [ido_major_version.ido_minor_version]) @@ -78,6 +78,8 @@ AC_FUNC_MALLOC AC_FUNC_MMAP AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) +GLIB_REQUIRED_VERSION=2.32.0 + AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=3@:>@])], @@ -86,9 +88,11 @@ AC_ARG_WITH([gtk], AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) if test "x$with_gtk" = "x2"; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.19.7) + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.19.7 + glib-2.0 >= GLIB_REQUIRED_VERSION]) else - PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.0) + PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0 + glib-2.0 >= GLIB_REQUIRED_VERSION]) AC_DEFINE_UNQUOTED(USE_GTK3, , [Use GTK3]) fi AC_SUBST(GTK_CFLAGS) |