[tracker/tracker-1.0] build: use pkg-config to look for which gdbus-codegen to use
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-1.0] build: use pkg-config to look for which gdbus-codegen to use
- Date: Thu, 10 Jul 2014 13:36:12 +0000 (UTC)
commit 9636e866faa3bcb174cc1cdecbde5a49a87bf218
Author: Aleksander Morgado <aleksander aleksander es>
Date: Fri Jun 13 16:58:14 2014 +0200
build: use pkg-config to look for which gdbus-codegen to use
configure.ac | 8 +++++++-
src/tracker-extract/Makefile.am | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1136cb2..b72f6e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -748,10 +748,16 @@ fi
DBUS_SERVICES_DIR="$services_dir"
AC_SUBST(DBUS_SERVICES_DIR)
-# Introduced with GSettings
+####################################################################
+# GLib/GIO utilities
+####################################################################
+
GLIB_MKENUMS=`$PKG_CONFIG glib-2.0 --variable=glib_mkenums`
AC_SUBST(GLIB_MKENUMS)
+GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`
+AC_SUBST(GDBUS_CODEGEN)
+
####################################################################
# Should we build GLib based unit tests
####################################################################
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 13acf65..aad1231 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -536,7 +536,8 @@ tracker-extract-priority-dbus.h: tracker-extract-priority-dbus-stamp
@:
tracker-extract-priority-dbus-stamp: Makefile.am $(top_srcdir)/data/dbus/tracker-extract-priority.xml
- gdbus-codegen --interface-prefix org.freedesktop.Tracker1.Extract. \
+ $(AM_V_GEN) $(GDBUS_CODEGEN) \
+ --interface-prefix org.freedesktop.Tracker1.Extract. \
--generate-c-code tracker-extract-priority-dbus \
--c-namespace TrackerExtractDBus \
$(top_srcdir)/data/dbus/tracker-extract-priority.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]