diff options
| author | Jamie McCracken <jamiemcc@src.gnome.org> | 2007-01-26 11:17:13 +0000 |
|---|---|---|
| committer | Jamie McCracken <jamiemcc@src.gnome.org> | 2007-01-26 11:17:13 +0000 |
| commit | d02959464882a307fe6b8476c624274a7d59f257 (patch) | |
| tree | 4b876a766942831ce05bf1ecebeec9f973ef8fd9 | |
| parent | ae0a65a946d03536509b3002de6bd390736eef50 (diff) | |
| download | tracker-d02959464882a307fe6b8476c624274a7d59f257.tar.gz | |
made libmagic requirement compulsory
svn path=/trunk/; revision=431
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 31 |
3 files changed, 44 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2007-01-25 Jamie McCracken <jamiemcc at gnome org> + + * fixed update of embedded keywords + * added deskbar handler to tarball and installation + 2007-01-24 Patch from Michael Biebl <mbiebl at gmail com> * converted xdgmime to private lib diff --git a/Makefile.am b/Makefile.am index 04f69f8c9..3f8fc2f1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,13 @@ xdgconfigdir = $(sysconfdir)/xdg/autostart pkgconfig_DATA = tracker.pc xdgconfig_DATA = trackerd.desktop +handlerdir = $(DESKBAR_HANDLER_DIR) +handler_DATA = python/deskbar-handler/tracker-handler.py + + EXTRA_DIST = \ $(xdgconfig_DATA) \ + $(handler_DATA) \ rdf-query-examples/80s-music.rdf \ rdf-query-examples/90s-music.rdf \ rdf-query-examples/all-documents.rdf \ @@ -15,6 +20,8 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in + + DISTCLEANFILES = \ intltool-extract \ @@ -22,4 +29,5 @@ DISTCLEANFILES = \ intltool-update DISTCHECK_CONFIGURE_FLAGS = \ - --with-session-bus-services-dir="\$(datadir)"/dbus-1/services + --with-session-bus-services-dir="\$(datadir)"/dbus-1/services \ + --with-deskbar-applet-handler-dir="\$(libdir)"/deskbar-applet/handlers diff --git a/configure.ac b/configure.ac index 04d247ee6..e51dbc8d6 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,15 @@ AC_PROG_LIBTOOL # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h sitdlib.h string.h sys/time.h unistd.h linux/unistd.h zlib.h magic.h]) +AC_CHECK_HEADERS([fcntl.h sitdlib.h string.h sys/time.h unistd.h linux/unistd.h]) + +AC_CHECK_HEADER([zlib.h], + [], + [AC_MSG_ERROR([You must have zlib.h and zlib installed])]) + +AC_CHECK_HEADER([magic.h], + [], + [AC_MSG_ERROR([You must have magic.h and libmagic installed])]) # Checks for functions AC_CHECK_FUNCS([getline]) @@ -82,6 +90,27 @@ fi DBUS_SERVICES_DIR="$services_dir" AC_SUBST(DBUS_SERVICES_DIR) + +#################################################################### +# Deskbar Applet Handler +#################################################################### + +AC_ARG_WITH([deskbar_applet_handler_dir], + AC_HELP_STRING([--with-deskbar-applet-handler-dir], [Path to Deskbar handler directory])) + +if test "x$with_deskbar_applet_handler_dir" = "x" ; then + handler_dir="`pkg-config --variable handlersdir deskbar-applet`" +else + handler_dir="$with_deskbar_applet_handler_dir" +fi + + + +DESKBAR_HANDLER_DIR="$handler_dir" +AC_SUBST(DESKBAR_HANDLER_DIR) + + + #################################################################### # Compiler warning checks #################################################################### |