summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac5
-rw-r--r--shell/Makefile.am4
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e14555a4..d081c486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -773,10 +773,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])
+
# *****************
# Help files
# *****************
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0f82bde5..bc29d864 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS= \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DATRIL_COMPILATION \
$(SHELL_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
@@ -115,7 +116,8 @@ atril_LDADD= \
$(top_builddir)/libdocument/libatrildocument.la \
$(top_builddir)/libview/libatrilview.la \
$(top_builddir)/libmisc/libevmisc.la \
- $(SHELL_LIBS)
+ $(SHELL_LIBS) \
+ $(MATE_DESKTOP_LIBS)
if PLATFORM_WIN32
atril_LDADD += atril-icon.o