diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-08-22 09:57:08 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-08-22 09:57:08 -0500 |
| commit | 2481b74fa64122365eef5293ae86d71b5fae3fa6 (patch) | |
| tree | cc3845ff2ee2c8ec173b072de9fabe29670588c4 /configure.ac | |
| parent | 8f279d3f26f588bb022f3f0d05edff6858035eab (diff) | |
| parent | 73302803e066d8d36e425feda15f57fca44f4bc5 (diff) | |
| download | ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.tar.gz ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.tar.bz2 ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.zip | |
merge lp:~charlesk/ido/nogtk2 to remove gtk2 support from the configure script and the source
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 0646ee2..963de1e 100644 --- a/configure.ac +++ b/configure.ac @@ -80,22 +80,11 @@ AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) AC_CHECK_LIBM GLIB_REQUIRED_VERSION=2.32.0 +GTK_REQUIRED_VERSION=3.4.0 + +PKG_CHECK_MODULES(GTK,[gtk+-3.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=3@:>@])], - [], - [with_gtk=3]) -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 - glib-2.0 >= GLIB_REQUIRED_VERSION]) -else - 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) AC_SUBST(GTK_LIBS) @@ -162,7 +151,6 @@ echo " ido $VERSION" echo " ===============================" echo "" echo " Prefix : ${prefix}" -echo " GTK : ${with_gtk}" echo " gcov : ${use_gcov}" echo "" echo " Documentation: ${enable_gtk_doc}" |