Version bump for 0.6

[grits] / configure.ac

diff --git a/configure.ac b/configure.ac
index 953029a8dce8f5937a872d2a1125177d751cee47..363d30f5ca48169eb6f4a911d617d99f8548c87c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
-m4_define([grits_release], [0.4.2])
-m4_define([grits_version], [0:0:0])
-m4_define([grits_subdir],  [grits0])
+m4_define([grits_release], [0.6])
+m4_define([grits_version], [2:0:0])
+m4_define([grits_subdir],  [grits2])
 
 # Init and options
 AC_INIT([grits], [grits_release], [andy753421@gmail.com])
@@ -25,9 +25,14 @@ GTK_DOC_CHECK(1.9)
 # Check for required packages
 PKG_CHECK_MODULES(GLIB,  glib-2.0 >= 2.14 gobject-2.0 gthread-2.0)
 PKG_CHECK_MODULES(CAIRO, cairo)
-PKG_CHECK_MODULES(GTK,   gtk+-2.0 >= 2.16 gtkglext-1.0)
+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)
+
 # Test for Windows vs. Unix
 case "${host}" in
        *mingw32*) WIN32="yes" ;;
@@ -40,6 +45,17 @@ fi
 AM_CONDITIONAL([WIN32],    test "$WIN32" = "yes")
 AM_CONDITIONAL([NOTWIN32], test "$WIN32" = "no")
 
+# Configure GL flags
+if test "$WIN32" = yes; then
+       GL_CFLAGS=""
+       GL_LIBS="-lglu32 -lopengl32"
+else
+       GL_CFLAGS=""
+       GL_LIBS="-lGL -lGLU"
+fi
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
+
 # Output 
 AC_CONFIG_FILES([
        Makefile