diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 8f699fa0..a637fbd3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.50) m4_define([marco_major_version], [1]) -m4_define([marco_minor_version], [9]) -m4_define([marco_micro_version], [4]) +m4_define([marco_minor_version], [10]) +m4_define([marco_micro_version], [1]) m4_define([marco_version], [marco_major_version.marco_minor_version.marco_micro_version]) @@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR(src/core/display.c) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([no-dist-gzip dist-xz check-news]) +AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz check-news]) AM_MAINTAINER_MODE # Honor aclocal flags @@ -22,11 +22,9 @@ GETTEXT_PACKAGE=marco AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain]) -IT_PROG_INTLTOOL([0.34.90]) +IT_PROG_INTLTOOL([0.50.1]) AC_PROG_CC -AC_ISC_POSIX AC_HEADER_STDC -AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL #### Integer sizes @@ -124,7 +122,6 @@ case "$with_gtk" in 3.0) GTK_API_VERSION=3.0 GTK_MIN_VERSION=2.90.0 CANBERRA_GTK=libcanberra-gtk3 - MATE_DESKTOP_VERSION=1.9.3 ;; esac AM_CONDITIONAL([HAVE_GTK2], [test "x$with_gtk" = "x2.0"]) @@ -134,10 +131,6 @@ GIO_MIN_VERSION=2.25.10 MARCO_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 $CANBERRA_GTK" AC_SUBST(GTK_API_VERSION) -if test x$GTK_API_VERSION = x3.0; then - MARCO_PC_MODULES="$MARCO_PC_MODULES mate-desktop-2.0 >= $MATE_DESKTOP_VERSION" -fi - GLIB_GSETTINGS AC_ARG_ENABLE(verbose-mode, @@ -231,7 +224,7 @@ fi ## or the render-specific check later have_xrender=no -XCOMPOSITE_VERSION=0.2 +XCOMPOSITE_VERSION=0.3 if test x$enable_compositor = xyes; then have_xcomposite=yes elif test x$enable_compositor = xauto; then |