X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=configure.ac;h=7537839277d27a84e9d585c33cba056d8e13c93e;hp=e3e9dc4ddda83d7f28b9eeb0014aa1492c343885;hb=b711eb6b2129ffff4d2451e67cfe7b20138096f7;hpb=c44c9e1d5ed7a07f6b068804591a4c059580ac63 diff --git a/configure.ac b/configure.ac index e3e9dc4..7537839 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ -m4_define([grits_release], [0.7]) -m4_define([grits_version], [4:0:0]) -m4_define([grits_subdir], [grits4]) +m4_define([grits_release], [0.8.1]) +m4_define([grits_version], [6:1:1]) +m4_define([grits_subdir], [grits5]) # Init and options AC_INIT([grits], [grits_release], [andy753421@gmail.com]) @@ -26,15 +26,20 @@ 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 glut for example plugin -AC_CHECK_LIB(glut, glutSolidTeapot, GLUT_LIBS="-lglut") -AM_CONDITIONAL(HAVE_GLUT, test "$GLUT_LIBS" != "") -AC_SUBST(GLUT_LIBS) +# 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) # Test for windowing system case "${host}" in