diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-08-21 13:10:11 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-08-21 13:10:11 -0500 |
| commit | e99fb9fae2845cf269d71bf197d35eeb69f29354 (patch) | |
| tree | a68075f2ac54b3d6bacea3132591595ac7d4f784 /configure.ac | |
| parent | 992e74684a09cf608442caf7503e0adf8eb2831d (diff) | |
| download | ayatana-ido-e99fb9fae2845cf269d71bf197d35eeb69f29354.tar.gz ayatana-ido-e99fb9fae2845cf269d71bf197d35eeb69f29354.tar.bz2 ayatana-ido-e99fb9fae2845cf269d71bf197d35eeb69f29354.zip | |
make the glib 2.32 requirement explicit in configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6e350b9..9306054 100644 --- a/configure.ac +++ b/configure.ac @@ -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) |