summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-03-10 17:40:52 -0500
committerraveit65 <[email protected]>2016-03-13 20:14:08 +0100
commitd7fda0e930816abe3696d86d88fd539e43125e9d (patch)
treea57b5433c7d22169314819f10d84bd2294c375ac
parentea38ff3e660049756adb98eb34ad1ab41aa08ee6 (diff)
downloadmate-panel-d7fda0e930816abe3696d86d88fd539e43125e9d.tar.bz2
mate-panel-d7fda0e930816abe3696d86d88fd539e43125e9d.tar.xz
gtk3.20-fix custom BG change on applets
Update makefile and configure.ac to build the new files needed for GTK 3.19 and later builds.
-rw-r--r--configure.ac2
-rw-r--r--libmate-panel-applet/Makefile.am14
2 files changed, 14 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e0dd016e..b9e2e948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ case "$with_gtk" in
esac
AC_SUBST(GTK_API_VERSION)
-
+AM_CONDITIONAL([HAVE_GTK3], [test "x$GTK_API_VERSION" = "x3.0"])
dnl pkg-config dependency checks
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-$GTK_API_VERSION)
diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am
index a718e373..cb83268c 100644
--- a/libmate-panel-applet/Makefile.am
+++ b/libmate-panel-applet/Makefile.am
@@ -14,7 +14,18 @@ libmate_panel_appletinclude_HEADERS = \
mate-panel-applet.h \
mate-panel-applet-gsettings.h \
mate-panel-applet-enums.h
-
+if HAVE_GTK3
+libmate_panel_applet_4_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ mate-panel-applet.h \
+ mate-panel-applet.c \
+ mate-panel-applet-factory.h \
+ mate-panel-applet-factory.c \
+ mate-panel-applet-gsettings.c \
+ mate-panel-applet-gsettings.h \
+ panel-plug.c \
+ panel-plug-private.h
+else
libmate_panel_applet_4_la_SOURCES = \
$(BUILT_SOURCES) \
mate-panel-applet.h \
@@ -23,6 +34,7 @@ libmate_panel_applet_4_la_SOURCES = \
mate-panel-applet-factory.c \
mate-panel-applet-gsettings.c \
mate-panel-applet-gsettings.h
+endif
libmate_panel_applet_4_la_LIBADD = \
$(LIBMATE_PANEL_APPLET_LIBS) \