[Xfce4-commits] <xfce4-mpc-plugin:master> Fix build with xfce4-panel 4.7/exo 0.5

[Landry Breuil]

Updating branch refs/heads/master
         to b3a3084ffe72cbd4e576c282c666365c792718b0 (commit)
       from 9c85bf33aae319a71d50b5c1c1da283fcc12932b (commit)

commit b3a3084ffe72cbd4e576c282c666365c792718b0
Author: Landry Breuil <landry at xfce.org>
Date:   Mon Aug 30 21:17:01 2010 +0200

    Fix build with xfce4-panel 4.7/exo 0.5
    
    - when exo-0.3 is not found, try to find exo-1 from exo 0.5 package
    - Also link/detect libxfcegui4 now that xfce4-panel in master
    doesn't add the corresponding LIBS/CFLAGS
    From Samuli Suominen in bz #6623, thanks!

 configure.ac.in          |    4 +++-
 panel-plugin/Makefile.am |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 7b9e80e..9261f53 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -35,7 +35,9 @@ AC_HEADER_STDC
 
 dnl configure the panel plugin
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22])
+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1], [],
+	[XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])])
 
 dnl check for libmpd presence
 AC_ARG_WITH(libmpd,
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index d81a4c9..e233a9b 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -4,10 +4,12 @@ plugin_PROGRAMS = xfce4-mpc-plugin
 xfce4_mpc_plugin_CFLAGS =						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	@EXO_CFLAGS@							\
+	@LIBXFCEGUI4_CFLAGS@						\
 	@LIBXFCE4PANEL_CFLAGS@
 
 xfce4_mpc_plugin_LDADD =						\
 	@EXO_LIBS@							\
+	@LIBXFCEGUI4_LIBS@						\
 	@LIBXFCE4PANEL_LIBS@