X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=configure.ac;h=33758b7af2ba30d571fc0491d1640bd67f2d375e;hp=e3e9dc4ddda83d7f28b9eeb0014aa1492c343885;hb=5c17e7d79895982036139dcffb5c17cefb1d4d9f;hpb=76a55b4ceb4d3326a7345c0ee13416fdaeb75070 diff --git a/configure.ac b/configure.ac index e3e9dc4..33758b7 100644 --- a/configure.ac +++ b/configure.ac @@ -26,11 +26,21 @@ PKG_PROG_PKG_CONFIG GTK_DOC_CHECK(1.9) # Check for required packages -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0 gthread-2.0 gmodule-2.0) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32 gobject-2.0 gthread-2.0 gmodule-2.0) PKG_CHECK_MODULES(CAIRO, cairo) -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16) PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26) +# Check for gtk 3 +AC_ARG_ENABLE([gtk3], + AS_HELP_STRING([--enable-gtk3], [Build with gtk3 support])) +AS_IF([test "$enable_gtk3" = "yes"], + [PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)], + [PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)]) +AS_IF([test "$enable_gtk3" = "yes"], + [GTK_VERSION=gtk+-3.0], + [GTK_VERSION=gtk+-2.0]) +AC_SUBST(GTK_VERSION) + # Check for glut for example plugin AC_CHECK_LIB(glut, glutSolidTeapot, GLUT_LIBS="-lglut") AM_CONDITIONAL(HAVE_GLUT, test "$GLUT_LIBS" != "")