[Xfce4-commits] <xfce4-indicator-plugin:master> Build fixes, automatic detection of libxfce4panel api version

[Andrzej]

Updating branch refs/heads/master
         to 54c2201a20bf5d1bc618133fcee634cb9c3ff8bf (commit)
       from 2a7ee580f832b9455f1bdef5a34ad57723ac3ad0 (commit)

commit 54c2201a20bf5d1bc618133fcee634cb9c3ff8bf
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Wed Apr 17 22:37:35 2013 +0100

    Build fixes, automatic detection of libxfce4panel api version
    
    TODO: check if changes in configure.ac.in are correct (seem to work here).

 configure.ac.in                                    |   13 +++++++++----
 ...ndicator.desktop.in => indicator.desktop.in.in} |    2 +-
 po/POTFILES.in                                     |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index b730825..b2b0404 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -72,14 +72,18 @@ XDT_CHECK_LIBX11_REQUIRE()
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
+m4_define([libxfce4panel_version_api], [2.0])
+LIBXFCE4PANEL_VERSION_API=libxfce4panel_version_api()
+AC_DEFINE([LIBXFCE4PANEL_VERSION_API], "libxfce4panel_version_api()", [libxfce4panel api version])
+AC_SUBST([LIBXFCE4PANEL_VERSION_API])
+
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0])
 dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 XDT_CHECK_PACKAGE([INDICATOR], [indicator3], [0.4.0], [indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], [indicator3-0.4], [0.3.90], [indicator_pkgname=indicator3-0.4], [])])
-dnl XDT_CHECK_PACKAGE([INDICATOR], [indicator3-0.4], [0.4.0])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
@@ -92,8 +96,8 @@ dnl ***********************
 INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $indicator_pkgname`
 INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $indicator_pkgname`
 
-AC_SUBST(INDICATORDIR)
-AC_SUBST(INDICATORICONSDIR)
+AC_SUBST([INDICATORDIR])
+AC_SUBST([INDICATORICONSDIR])
 
 dnl *********************************
 dnl *** Substitute platform flags ***
@@ -114,6 +118,7 @@ icons/Makefile
 icons/48x48/Makefile
 icons/scalable/Makefile
 panel-plugin/Makefile
+panel-plugin/indicator.desktop.in
 po/Makefile.in
 ])
 
diff --git a/panel-plugin/indicator.desktop.in b/panel-plugin/indicator.desktop.in.in
similarity index 85%
rename from panel-plugin/indicator.desktop.in
rename to panel-plugin/indicator.desktop.in.in
index aba66ee..fd706e9 100644
--- a/panel-plugin/indicator.desktop.in
+++ b/panel-plugin/indicator.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=An indicator of something that needs your attention on the desktop
 Icon=xfce4-indicator-plugin
 X-XFCE-Module=indicator-plugin
 X-XFCE-Internal=FALSE
-X-XFCE-Gtk3=FALSE
+X-XFCE-API=@LIBXFCE4PANEL_VERSION_API@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b800280..0c90bc0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-panel-plugin/indicator.desktop.in
+panel-plugin/indicator.desktop.in.in
 panel-plugin/indicator.c
 panel-plugin/indicator-box.c
 panel-plugin/indicator-button.c