X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=7f57cb6a542d94aa3bb5f240832b4595812e0c2b;hb=3200807b2f6116384f0d65ce5fb94baff4f1cf2d;hp=e92d77e38521578dcb366d1f56c8fb48ebbc34e5;hpb=8bbd94522aa48d4ae72b1034cf7a17e29f98f329;p=grits diff --git a/configure.ac b/configure.ac index e92d77e..7f57cb6 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,7 +26,7 @@ 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(SOUP, libsoup-2.4 >= 2.26) @@ -46,9 +46,6 @@ 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" @@ -60,6 +57,12 @@ 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