From bbb90d3fd48628baf8ac18636030c29ab4ef067a Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 7 Aug 2013 11:11:48 +0200 Subject: [PATCH 2/3] build: Find gdbus-codegen path from gio-2.0 pkg-config file --- configure.ac | 14 ++++++++++++++ src/Makefile.am | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0cd39db..fe85832 100644 --- a/configure.ac +++ b/configure.ac @@ -153,6 +153,20 @@ AC_ARG_WITH(dbus-service-user, dbus_srv_user="root") AC_SUBST(dbus_srv_user) +# gdbus-codegen +if test x$cross_compiling != xyes; then + GDBUS_CODEGEN=`$PKG_CONFIG --variable gdbus_codegen gio-2.0` +else + AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen]) +fi +AC_SUBST([GDBUS_CODEGEN]) + +if test "x$GDBUS_CODEGEN" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([gdbus-codegen not found.])],[$2]) +else + ifelse([$1],,[:],[$1]) +fi + AC_CONFIG_FILES([ Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 8308e0d..6f6342e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ interface_DATA = geoclue-interface.xml dbus_built_sources = geoclue-interface.c geoclue-interface.h geoclue-interface.c: geoclue-interface.h geoclue-interface.h: Makefile.am $(interface_DATA) - gdbus-codegen \ + $(AM_V_GEN)$(GDBUS_CODEGEN) \ --interface-prefix org.freedesktop.GeoClue2. \ --c-namespace GClue \ --generate-c-code geoclue-interface \ -- 1.8.3.1