@@ -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 ================================================================
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user