Hi.
Currently (tracker 0.5.4 release and svn) install the deskbar applet
handler to ${ROOT} if you do not have deskbar applet installed.
The attached patch allows you to disable the installation of the handler
via the --disable-deskbar-applet option. This way the deskbar applet
handler is installed into the proper location when the
--enable-deskbar-applet option is passed.
Please review and apply the patch.
Thanks.
Saleem Abdulrasool
compnerd (at) gentoo (dot) org
Index: configure.ac
===================================================================
--- configure.ac (revision 443)
+++ configure.ac (working copy)
@@ -95,6 +95,12 @@
# Deskbar Applet Handler
####################################################################
+AC_ARG_ENABLE([deskbar_applet],
+ AC_HELP_STRING([--enable-deskbar-applet], [Enable support for deskbar applet]),,
+ [enable_deskbar_applet=no])
+
+AM_CONDITIONAL(USING_DESKBAR_APPLET, test "x$enable_deskbar_applet" != "xno")
+
AC_ARG_WITH([deskbar_applet_handler_dir],
AC_HELP_STRING([--with-deskbar-applet-handler-dir], [Path to Deskbar handler directory]))
@@ -104,13 +110,9 @@
handler_dir="$with_deskbar_applet_handler_dir"
fi
-
-
DESKBAR_HANDLER_DIR="$handler_dir"
AC_SUBST(DESKBAR_HANDLER_DIR)
-
-
####################################################################
# Compiler warning checks
####################################################################
Index: Makefile.am
===================================================================
--- Makefile.am (revision 443)
+++ Makefile.am (working copy)
@@ -5,8 +5,13 @@
pkgconfig_DATA = tracker.pc
xdgconfig_DATA = trackerd.desktop
+if USING_DESKBAR_APPLET
handlerdir = $(DESKBAR_HANDLER_DIR)
handler_DATA = python/deskbar-handler/tracker-handler.py
+else
+handlerdir =
+handler_DATA =
+endif
EXTRA_DIST = \
Attachment:
pgpda2GomDQN5.pgp
Description: PGP signature