wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix build breakage introduced in last commit 

also see 37abef2d6b
This commit is contained in:
Monsta 2015-11-22 10:13:32 +03:00
parent b40b78a7cb
commit 125169f8cb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -212,10 +212,13 @@ AC_ARG_WITH(matedesktop,
AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"]) AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"])
if test "$with_matedesktop" = "yes"; then 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]) AC_DEFINE([WITH_MATEDESKTOP],[1],[Define if mate-desktop support is enabled])
fi fi
AC_SUBST([MATE_DESKTOP_CFLAGS])
AC_SUBST([MATE_DESKTOP_LIBS])
dnl ================================================================ dnl ================================================================
dnl GSettings related settings dnl GSettings related settings
dnl ================================================================ dnl ================================================================

4
pluma/Makefile.am
View File

@ -10,6 +10,7 @@ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(srcdir)/smclient \ -I$(srcdir)/smclient \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
@ -26,7 +27,8 @@ libpluma_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_
libpluma_la_LIBADD = \ libpluma_la_LIBADD = \
dialogs/libdialogs.la \ 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 # PLUMA_LIBS must be the last to ensure correct order on some platforms
libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE