summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-10-11 17:56:57 +0200
committerStefano Karapetsas <[email protected]>2012-10-11 17:56:57 +0200
commit0ffeaf53e92e366947ebb5424a5b15c1a8f39a5f (patch)
treef6924bc2d6f6072fa1c9d32fb1225a5fbf909082
parent718cd95fd268e87370aa4a4d8953dfe7d6291a94 (diff)
downloadmate-panel-0ffeaf53e92e366947ebb5424a5b15c1a8f39a5f.tar.bz2
mate-panel-0ffeaf53e92e366947ebb5424a5b15c1a8f39a5f.tar.xz
fix dconf requirements
-rw-r--r--configure.ac13
-rw-r--r--mate-panel/libpanel-util/Makefile.am1
2 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 1fb4ff2a..2ae0b9a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,21 +66,22 @@ LIBMATE_MENU_REQUIRED=1.1.0
CAIRO_REQUIRED=1.0.0
MATEWEATHER_REQUIRED=1.1.0
DBUS_GLIB_REQUIRED=0.80
-DCONF_REQUIRED=0.13
+DCONF_NEW_REQUIRED=0.13
+DCONF_OLD_REQUIRED=0.10
dnl pkg-config dependency checks
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
PKG_CHECK_MODULES(GMODULE, gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
-PKG_CHECK_MODULES(PANEL, $GMODULE_ADD gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED gio-2.0 >= $GLIB_REQUIRED libmate-menu >= $LIBMATE_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED dconf)
+PKG_CHECK_MODULES(PANEL, $GMODULE_ADD gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED gio-2.0 >= $GLIB_REQUIRED libmate-menu >= $LIBMATE_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
AC_SUBST(PANEL_CFLAGS)
AC_SUBST(PANEL_LIBS)
-PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_REQUIRED],
- [AC_DEFINE([HAVE_DCONF_0_13], [1], [Use DCONF >= 0.13])],
- [PKG_CHECK_MODULES([DCONF], [dconf >= 0.12],
- [AC_DEFINE([HAVE_DCONF_0_12], [1], [Use DCONF 0.12])
+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])
])
])
diff --git a/mate-panel/libpanel-util/Makefile.am b/mate-panel/libpanel-util/Makefile.am
index 699f4b2a..96823bc1 100644
--- a/mate-panel/libpanel-util/Makefile.am
+++ b/mate-panel/libpanel-util/Makefile.am
@@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libpanel-util.la
AM_CPPFLAGS = \
$(PANEL_CFLAGS) \
+ $(DCONF_CFLAGS) \
-I. \
-I$(srcdir) \
-I$(top_builddir)/mate-panel/libpanel-util \