From d7fda0e930816abe3696d86d88fd539e43125e9d Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Thu, 10 Mar 2016 17:40:52 -0500 Subject: 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. --- configure.ac | 2 +- libmate-panel-applet/Makefile.am | 14 +++++++++++++- 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) \ -- cgit v1.2.1