diff options
| author | Stefano Karapetsas <[email protected]> | 2012-10-12 17:56:34 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-10-12 17:56:34 +0200 |
| commit | 3aa881b8b74b72fd2840fc641a51801b390b044e (patch) | |
| tree | 63de54f0782ab52ba64f84ca0e585b11b671e9d9 | |
| parent | 8230a10b97810451abe1b3283f5adf627f33a8b1 (diff) | |
| download | mate-panel-3aa881b8b74b72fd2840fc641a51801b390b044e.tar.bz2 mate-panel-3aa881b8b74b72fd2840fc641a51801b390b044e.tar.xz | |
fix dconf requirements
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | mate-panel/Makefile.am | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2ae0b9a7..17556341 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,9 @@ PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED], [AC_DEFINE([HAVE_DCONF_0_10], [1], [Use DCONF $DCONF_OLD_REQUIRED]) ]) ]) +AC_SUBST(DCONF_CFLAGS) +AC_SUBST(DCONF_LIBS) + PKG_CHECK_MODULES(LIBMATE_PANEL_APPLET, gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED) AC_SUBST(LIBMATE_PANEL_APPLET_CFLAGS) diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index 03cae874..9ac715f7 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -8,6 +8,7 @@ libexec_SCRIPTS = mate-panel-add AM_CPPFLAGS = \ $(PANEL_CFLAGS) \ + $(DCONF_CFLAGS) \ -I. \ -I$(srcdir) \ -I$(top_builddir)/mate-panel \ @@ -137,6 +138,7 @@ mate_panel_LDADD = \ $(top_builddir)/mate-panel/libmate-panel-applet-private/libmate-panel-applet-private.la \ $(top_builddir)/mate-panel/libpanel-util/libpanel-util.la \ $(PANEL_LIBS) \ + $(DCONF_LIBS) \ $(XRANDR_LIBS) \ $(X_LIBS) \ -lm @@ -153,6 +155,7 @@ mate_desktop_item_edit_SOURCES = \ mate_desktop_item_edit_LDADD = \ $(top_builddir)/mate-panel/libpanel-util/libpanel-util.la \ $(PANEL_LIBS) \ + $(DCONF_LIBS) \ -lX11 mate_panel_test_applets_SOURCES = \ @@ -170,7 +173,8 @@ mate_panel_test_applets_CPPFLAGS = \ mate_panel_test_applets_LDADD = \ $(top_builddir)/mate-panel/libmate-panel-applet-private/libmate-panel-applet-private-mini.la \ $(top_builddir)/mate-panel/libpanel-util/libpanel-util.la \ - $(PANEL_LIBS) + $(PANEL_LIBS) \ + $(DCONF_LIBS) mate_panel_test_applets_LDFLAGS = -export-dynamic |