[Xfce4-commits] <xfce4-indicator-plugin:master> Make IDO library optional

[Andrzej]

Updating branch refs/heads/master
         to c86bf2cdd3e6112c562f1d77929ea724aa1e6097 (commit)
       from f949719fafbd50744e3697470eef08177e386fea (commit)

commit c86bf2cdd3e6112c562f1d77929ea724aa1e6097
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Sep 1 21:01:28 2013 +0100

    Make IDO library optional

 configure.ac.in          |   11 ++++++++++-
 panel-plugin/indicator.c |    6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4fd7b66..7b90506 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -84,7 +84,11 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.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], [])])
-XDT_CHECK_PACKAGE([IDO], [libido3-0.1], [13.10.0])
+
+dnl ****************************
+dnl *** Optional IDO library ***
+dnl ****************************
+XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libido3-0.1], [13.10.0], [ido], [IDO library])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
@@ -130,4 +134,9 @@ echo
 echo "Build Configuration:"
 echo
 echo "* Debug Support:    $enable_debug"
+if test x"$IDO_FOUND" = x"yes"; then
+echo "* Use IDO library:  yes"
+else
+echo "* Use IDO library:  no"
+fi
 echo
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 164fc0a..e634f05 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -43,6 +43,10 @@
 #include "indicator-button.h"
 #include "indicator-dialog.h"
 
+#ifdef HAVE_IDO
+#include <libido/libido.h>
+#endif
+
 #ifdef LIBXFCE4PANEL_CHECK_VERSION
 #if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
 #define HAS_PANEL_49
@@ -285,7 +289,9 @@ indicator_construct (XfcePanelPlugin *plugin)
   gint              indicators_loaded = 0;
   GtkWidget        *label;
 
+  #ifdef HAVE_IDO
   ido_init();
+  #endif
 
   xfce_panel_plugin_menu_show_configure (plugin);
   xfce_panel_plugin_menu_show_about (plugin);