From 125169f8cb0ee1d06179a3769fe3368b5df35527 Mon Sep 17 00:00:00 2001 From: Monsta Date: Sun, 22 Nov 2015 10:13:32 +0300 Subject: [PATCH] fix build breakage introduced in last commit also see https://github.com/mate-desktop/atril/commit/37abef2d6b86de04b6ae54a79e89b58304ae4762 --- configure.ac | 5 ++++- pluma/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c7fe30c..639c6fb 100644 --- a/configure.ac +++ b/configure.ac @@ -212,10 +212,13 @@ AC_ARG_WITH(matedesktop, AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"]) if test "$with_matedesktop" = "yes"; then - PKG_CHECK_MODULES([SHELL_CORE], mate-desktop-2.0 >= $MATEDESKTOP_REQUIRED) + PKG_CHECK_MODULES([MATE_DESKTOP], mate-desktop-2.0 >= $MATEDESKTOP_REQUIRED) AC_DEFINE([WITH_MATEDESKTOP],[1],[Define if mate-desktop support is enabled]) fi +AC_SUBST([MATE_DESKTOP_CFLAGS]) +AC_SUBST([MATE_DESKTOP_LIBS]) + dnl ================================================================ dnl GSettings related settings dnl ================================================================ diff --git a/pluma/Makefile.am b/pluma/Makefile.am index 0191435..13a0374 100644 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/smclient \ $(PLUMA_CFLAGS) \ + $(MATE_DESKTOP_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ @@ -26,7 +27,8 @@ libpluma_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_ libpluma_la_LIBADD = \ dialogs/libdialogs.la \ - smclient/libeggsmclient.la + smclient/libeggsmclient.la \ + $(MATE_DESKTOP_LIBS) # PLUMA_LIBS must be the last to ensure correct order on some platforms libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE