diff options
| author | Monsta <[email protected]> | 2015-11-22 10:13:32 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-11-22 10:13:32 +0300 |
| commit | 125169f8cb0ee1d06179a3769fe3368b5df35527 (patch) | |
| tree | c98470aaab48ea1953c69bc76dbdd50750949fb4 | |
| parent | b40b78a7cb545f8d888694ce93f7cd9f9ff759a1 (diff) | |
| download | pluma-125169f8cb0ee1d06179a3769fe3368b5df35527.tar.bz2 pluma-125169f8cb0ee1d06179a3769fe3368b5df35527.tar.xz | |
fix build breakage introduced in last commit
also see https://github.com/mate-desktop/atril/commit/37abef2d6b86de04b6ae54a79e89b58304ae4762
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | pluma/Makefile.am | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c7fe30c5..639c6fb9 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 01914351..13a03742 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 |