From 3d15b6fb40900b043dc3863d3ad5571029e45c3d Mon Sep 17 00:00:00 2001 From: Alex Dedul Date: Tue, 12 Oct 2010 10:19:09 +0900 Subject: [PATCH] Fix compatibility with Xfce 4.7+ Make the dependency on libxfcegui4 explicit, instead of relying on some other component to link to it for us. Fixes bug 6466. --- configure.in.in | 3 +++ panel-plugin/Makefile.am | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index bcaf4fc..a601f3d 100644 --- a/configure.in.in +++ b/configure.in.in @@ -54,6 +54,9 @@ AC_SUBST(SOLLIBS) dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) +dnl configure the libxfcegui4 +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) + dnl Check for i18n support XDT_I18N([@LINGUAS@]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 2e0850b..0635d67 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -16,11 +16,13 @@ xfce4_netload_plugin_SOURCES = \ xfce4_netload_plugin_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBXFCE4PANEL_CFLAGS@ + @LIBXFCE4PANEL_CFLAGS@ \ + @LIBXFCEGUI4_CFLAGS@ -xfce4_netload_plugin_LDFLAGS = \ +xfce4_netload_plugin_LDADD = \ @SOLLIBS@ \ - @LIBXFCE4PANEL_LIBS@ + @LIBXFCE4PANEL_LIBS@ \ + @LIBXFCEGUI4_LIBS@ # .desktop file #