diff options
| author | Alexander Larsson <alexl@redhat.com> | 2013-01-28 14:57:16 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2013-01-28 15:05:42 +0100 |
| commit | 4fc672aa1cb12ef4ea34db08c7d3e6deee0dea6d (patch) | |
| tree | 8d6f96f9df6fccc140a43c6b2c1bffe0483edca0 | |
| parent | ed6642248cd572adb9aa485d342043b7a84103f6 (diff) | |
Support new tracker version
We now also support building with tracker 0.16 (as well as the previous
0.14).
https://bugzilla.gnome.org/show_bug.cgi?id=692662
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index bd7c580..557cd23 100644 --- a/configure.ac +++ b/configure.ac @@ -70,11 +70,15 @@ PKG_CHECK_MODULES(BOXES, [ spice-client-gtk-3.0 >= $SPICE_GTK_MIN_VERSION gudev-1.0 >= $GUDEV_MIN_VERSION libosinfo-1.0 >= $OSINFO_MIN_VERSION - tracker-sparql-0.14 >= $TRACKER_SPARQL uuid >= $UUID_REQUIRED libsoup-2.4 >= $LIBSOUP_REQUIRED ]) +PKG_CHECK_MODULES(TRACKER, [tracker-sparql-0.16 >= $TRACKER_SPARQL], [] , + [PKG_CHECK_MODULES(TRACKER, [tracker-sparql-0.14 >= $TRACKER_SPARQL])] +) + + VALA_ADD_CHECKFILE([src/gnome_boxes_vala.stamp]) PKG_CHECK_MODULES(BOXES_COMMON, [ diff --git a/src/Makefile.am b/src/Makefile.am index 02b7fd5..276a524 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -116,11 +116,12 @@ gnome_boxes_SOURCES = \ gnome_boxes_LDADD = \ $(BOXES_LIBS) \ + $(TRACKER_LIBS) \ $(top_builddir)/libgd/libgd.la \ libcommon.a \ $(NULL) -gnome_boxes_CFLAGS = $(BOXES_CFLAGS) +gnome_boxes_CFLAGS = $(BOXES_CFLAGS) $(TRACKER_CFLAGS) $(srcdir)/gnome_boxes_vala.stamp: $(libcommon_a_DEPENDENCIES) MAINTAINERCLEANFILES += $(gnome_boxes_SOURCES:.vala=.c) |