Add support for GTK 3

[grits] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7f57cb6a542d94aa3bb5f240832b4595812e0c2b..33758b7af2ba30d571fc0491d1640bd67f2d375e 100644 (file)
--- 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" != "")
@@ -52,7 +62,7 @@ GL_CFLAGS="-DSYS_$SYS"
 case "$SYS" in
        "WIN") GL_LIBS="-lglu32 -lopengl32" ;;
        "MAC") GL_LIBS="-framework OpenGL" ;;
-       "X11") GL_LIBS="-lGL -lGLU" ;;
+       "X11") GL_LIBS="-lX11 -lGL -lGLU" ;;
 esac
 AC_SUBST([GL_CFLAGS])
 AC_SUBST([GL_LIBS])