diff options
| author | Jamie McCracken <jamiemcc@src.gnome.org> | 2007-01-27 22:55:10 +0000 |
|---|---|---|
| committer | Jamie McCracken <jamiemcc@src.gnome.org> | 2007-01-27 22:55:10 +0000 |
| commit | 34799bdcfa28569aabce368bf2efe0ebf40576eb (patch) | |
| tree | e5aa0cb61a04cc3345cc118e0132e3215f107fa5 | |
| parent | 769d683e387e735f2d37c039ec580c7279370130 (diff) | |
| download | tracker-34799bdcfa28569aabce368bf2efe0ebf40576eb.tar.gz | |
make deskbar handler optional
svn path=/trunk/; revision=444
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 10 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2007-01-27 Patch from Saleem Abdulrasool <compnerd at gentoo org> + + * Made deskbar-handler installation optional + 2007-01-27 Nickolay V. Shmyrev <nshmyrev@yandex.ru> * configure.ac: added ru to ALL_LINGUAS. diff --git a/Makefile.am b/Makefile.am index 3f8fc2f1e..5dcb5a9ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,13 @@ xdgconfigdir = $(sysconfdir)/xdg/autostart 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 = \ diff --git a/configure.ac b/configure.ac index c432249b7..14db6d521 100644 --- a/configure.ac +++ b/configure.ac @@ -95,6 +95,12 @@ AC_SUBST(DBUS_SERVICES_DIR) # 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 @@ else handler_dir="$with_deskbar_applet_handler_dir" fi - - DESKBAR_HANDLER_DIR="$handler_dir" AC_SUBST(DESKBAR_HANDLER_DIR) - - #################################################################### # Compiler warning checks #################################################################### |