diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 30584aa4..45423a34 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mate-control-center], [1.9.0], [htts://www.mate-desktop.org/]) +AC_INIT([mate-control-center], [1.11.0], [htts://www.mate-desktop.org/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([shell]) @@ -8,7 +8,6 @@ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O AC_STDC_HEADERS @@ -26,9 +25,15 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl +# GLib min/max required versions +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], + [Warn on use of APIs added after GLib 2.36]) +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], + [Warn on use of APIs deprecated before GLib 2.36]) + # Internationalization support -IT_PROG_INTLTOOL([0.37.1]) +IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=mate-control-center AC_SUBST(GETTEXT_PACKAGE) @@ -77,12 +82,14 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.24.0 + MATE_DESKTOP_REQUIRED=1.11.0 LIBCANBERRA_API_VERSION= LIBUNIQUE_API_VERSION=1.0 ENGINES_FOLDER="engines" ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 + MATE_DESKTOP_REQUIRED=1.11.0 LIBCANBERRA_API_VERSION=3 LIBUNIQUE_API_VERSION=3.0 ENGINES_FOLDER="theming-engines" @@ -143,7 +150,6 @@ AC_CHECK_LIB(m, floor) dnl ============================================== dnl Check that we meet the dependencies dnl ============================================== -MATE_DESKTOP_REQUIRED=1.7.3 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl @@ -162,7 +168,7 @@ PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= MATE_DESKTOP_REQUIRED) PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.9.1) PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.36 gio-2.0 gtk+-$GTK_API_VERSION) -PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= 1.5.2) +PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= 1.11.0) PKG_CHECK_MODULES(GIO, gio-2.0) PKG_CHECK_MODULES([DCONF], [dconf >= 0.13.4], @@ -197,18 +203,8 @@ AC_SUBST(WARN_CFLAGS) AM_CONDITIONAL(HAVE_LIBMATESLAB, [test $have_libmateslab = yes]) -dnl -dnl Check for Xft version 2; we build in extra functionality to the font capplet -dnl when we have it. -dnl -xft_modules= -if $PKG_CONFIG --exists xft ; then - xft_modules="xft" - AC_DEFINE(HAVE_XFT2,,[Define if Xft functionality is available]) -fi - -PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules fontconfig) -PKG_CHECK_MODULES(FONT_VIEWER, $COMMON_MODULES $xft_modules freetype2) +PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES pango) +PKG_CHECK_MODULES(FONT_VIEWER, $COMMON_MODULES freetype2) PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES) @@ -337,6 +333,8 @@ fi AC_CONFIG_FILES([ Makefile +org.mate.control-center.gschema.xml +org.mate.control-center.keybinding.gschema.xml capplets/Makefile capplets/about-me/Makefile capplets/about-me/mate-about-me.desktop.in |