X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=89d989e29348dfa7a35cb63c7d1381956b68f4b0;hb=782f6b5a0985384b68f2a4f233eef0541efd4c94;hp=953029a8dce8f5937a872d2a1125177d751cee47;hpb=d8948985b467a5cfd0447ae413ed1c5d01afb024;p=grits diff --git a/configure.ac b/configure.ac index 953029a..89d989e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -m4_define([grits_release], [0.4.2]) -m4_define([grits_version], [0:0:0]) +m4_define([grits_release], [0.5.2]) +m4_define([grits_version], [1:2:1]) m4_define([grits_subdir], [grits0]) # Init and options @@ -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