diff options
| author | Stefano Karapetsas <[email protected]> | 2014-04-23 19:29:22 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-04-23 19:29:22 +0200 |
| commit | 693c6c76c7cf54f6e314255760b05198a99ac4d5 (patch) | |
| tree | 81b4742741c3c6b1324848bd5e6c5b5b4af276ce /configure.ac | |
| parent | 6767fa71d3a17c73f7d9ffa49004dcc68feb7e7a (diff) | |
| download | mate-terminal-693c6c76c7cf54f6e314255760b05198a99ac4d5.tar.bz2 mate-terminal-693c6c76c7cf54f6e314255760b05198a99ac4d5.tar.xz | |
Use common dconf functions from libmate-desktop
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 0fed807..ce5a25a 100644 --- a/configure.ac +++ b/configure.ac @@ -40,12 +40,11 @@ MATE_COMPILE_WARNINGS([maximum]) AM_GLIB_GNU_GETTEXT -DCONF_NEW_REQUIRED=0.13.4 -DCONF_OLD_REQUIRED=0.10.0 GLIB_REQUIRED=2.25.0 GIO_REQUIRED=2.25.12 GTK_REQUIRED=2.14.0 VTE_REQUIRED=0.27.1 +MATE_DESKTOP_REQUIRED=1.9.0 AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], @@ -81,6 +80,7 @@ PKG_CHECK_MODULES([TERM], gthread-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED + mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED $PLATFORM_DEPS]) # ******** @@ -120,16 +120,6 @@ AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"]) GLIB_GSETTINGS -PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED], - [AC_DEFINE([HAVE_DCONF_NEW], [1], [Use DCONF >= 0.13])], - [PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_OLD_REQUIRED], - [AC_DEFINE([HAVE_DCONF_OLD], [1], [Use DCONF 0.12]) - ]) -]) -AC_SUBST(DCONF_CFLAGS) -AC_SUBST(DCONF_LIBS) - - GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)" AC_SUBST([GLIB_GENMARSHAL]) GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)" |