diff options
| author | Clement Lefebvre <[email protected]> | 2015-09-04 12:17:13 +0100 |
|---|---|---|
| committer | Clement Lefebvre <[email protected]> | 2015-09-04 12:17:13 +0100 |
| commit | 4b9d81364c6fa61373cc03b554c18db5277c070e (patch) | |
| tree | 10ad94b4c9b8e78451147e61cc78f5fac61791a9 /configure.ac | |
| parent | 11757da17e9fcdd33474aaa342bf4b6a2daf82d0 (diff) | |
| parent | cc9dd7f684966eb1fe1e6065f5f407f3b23e9f59 (diff) | |
| download | mate-desktop-4b9d81364c6fa61373cc03b554c18db5277c070e.tar.bz2 mate-desktop-4b9d81364c6fa61373cc03b554c18db5277c070e.tar.xz | |
Merge pull request #195 from monsta/dconf
drop dconf 0.10 compatibility (it's ancient)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index ba09b37..13a45ed 100644 --- a/configure.ac +++ b/configure.ac @@ -166,15 +166,10 @@ dnl ---------------------------------------------------------------------------- dnl DCONF dnl ---------------------------------------------------------------------------- -DCONF_NEW_REQUIRED=0.13.4 -DCONF_OLD_REQUIRED=0.10.0 - -PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED], - [AC_DEFINE([HAVE_DCONF_0_13], [1], [Use DCONF >= $DCONF_NEW_REQUIRED])], - [PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_OLD_REQUIRED], - [AC_DEFINE([HAVE_DCONF_0_10], [1], [Use DCONF $DCONF_OLD_REQUIRED]) - ]) -]) +DCONF_REQUIRED=0.13.4 + +PKG_CHECK_MODULES(DCONF, dconf >= $DCONF_REQUIRED) + AC_SUBST(DCONF_CFLAGS) AC_SUBST(DCONF_LIBS) |