X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=d80cf8404222f519e2bc21b371713ee5e4b0e680;hb=refs%2Fheads%2Fgtk3;hp=e92d77e38521578dcb366d1f56c8fb48ebbc34e5;hpb=8bbd94522aa48d4ae72b1034cf7a17e29f98f329;p=grits

diff --git a/configure.ac b/configure.ac
index e92d77e..d80cf84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
-m4_define([grits_release], [0.6.2])
-m4_define([grits_version], [2:1:0])
-m4_define([grits_subdir],  [grits2])
+m4_define([grits_release], [0.7])
+m4_define([grits_version], [4:0:0])
+m4_define([grits_subdir],  [grits4])
 
 # Init and options
 AC_INIT([grits], [grits_release], [andy753421@gmail.com])
@@ -26,9 +26,9 @@ 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)
+PKG_CHECK_MODULES(GLIB,  glib-2.0 >= 2.14 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(GTK,   gtk+-3.0 >= 3.0)
 PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)
 
 # Check for glut for example plugin
@@ -46,20 +46,23 @@ esac
 AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
 AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
 AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
-if test "$WIN32" = yes; then
-	ac_default_prefix="/"
-fi
 
 # OpenGL flags
 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])
 
+# Check for relative build
+AC_ARG_ENABLE(relative, [AS_HELP_STRING([--enable-relative],
+	[enable runtime search paths @<:@default=no@:>@])],
+	[DOTS=".."; ac_default_prefix="/"])
+AC_SUBST([DOTS])
+
 # Output 
 AC_CONFIG_FILES([
 	Makefile