From b585e6b32a0afa36e1c5c698dd9ab79c2816b691 Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Mon, 21 Nov 2016 19:59:09 +0300
Subject: build: require dconf >= 0.13.4

not sure if we need it though - we use dconf functions from
libmate-desktop, not from libdconf directly
---
 configure.ac | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index e3cd7a75..f34513fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,8 +63,7 @@ GLIB_REQUIRED=2.36
 LIBMATE_MENU_REQUIRED=1.10.0
 CAIRO_REQUIRED=1.0.0
 DBUS_GLIB_REQUIRED=0.80
-DCONF_NEW_REQUIRED=0.13.4
-DCONF_OLD_REQUIRED=0.10.0
+DCONF_REQUIRED=0.13.4
 LIBRSVG_REQUIRED=2.36.2
 
 # GTK library
@@ -109,15 +108,7 @@ PKG_CHECK_MODULES(PANEL, $GMODULE_ADD gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pan
 AC_SUBST(PANEL_CFLAGS)
 AC_SUBST(PANEL_LIBS)
 
-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])
-    ])
-])
-AC_SUBST(DCONF_CFLAGS)
-AC_SUBST(DCONF_LIBS)
-
+PKG_CHECK_MODULES(DCONF, dconf >= $DCONF_REQUIRED)
 
 PKG_CHECK_MODULES(LIBMATE_PANEL_APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(LIBMATE_PANEL_APPLET_CFLAGS)
-- 
cgit v1.2.1