Updating branch refs/heads/master
to 58fd735f17d03193d3f17d8e02f46bf8e908a3bc (commit)
from 3ac60757c291cf6bc6eee617f091d2be51c63ac5 (commit)
commit 58fd735f17d03193d3f17d8e02f46bf8e908a3bc
Author: Florian Rivoal <[email protected]>
Date: Fri Oct 29 09:33:05 2010 +0900
Fix compatibility with Xfce 4.7+
Add exo-0.5 detection and explicitly require libxfcegui4. Fixes bug
6616.
configure.in.in | 4 +++-
panel-plugin/Makefile.am | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 95234fc..0b1efab 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -52,9 +52,11 @@ XDT_I18N([...@linguas@])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3], [],
+ [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 08694d5..ba6464e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -21,14 +21,16 @@ xfce4_verve_plugin_CFLAGS =
\
@LIBEXO_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
+ @LIBXFCEGUI4_CFLAGS@ \
@LIBPCRE_CFLAGS@ \
@GLIB_CFLAGS@ \
@GTHREAD_CFLAGS@
-xfce4_verve_plugin_LDFLAGS = \
+xfce4_verve_plugin_LDADD = \
@LIBEXO_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
+ @LIBXFCEGUI4_LIBS@ \
@LIBPCRE_LIBS@ \
@GLIB_LIBS@ \
@GTHREAD_LIBS@
@@ -43,7 +45,7 @@ xfce4_verve_plugin_CFLAGS +=
\
-DDBUS_API_SUBJECT_TO_CHANGE \
$(DBUS_CFLAGS)
-xfce4_verve_plugin_LDFLAGS += \
+xfce4_verve_plugin_LDADD += \
$(DBUS_LIBS)
verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
