From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 8 Jan 2009 20:17:41 +0000 (+0100)
Subject: Add support for reading config directory from dbus-1.pc
X-Git-Tag: 0.8~11
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=6b0565ed922f60d121a73f04444e58bc171e1a55;hp=049eae8ec20f0b3dd37d6f4b843da318966d4346;p=connman

Add support for reading config directory from dbus-1.pc
---

diff --git a/configure.ac b/configure.ac
index a6cc07c..96d3758 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,13 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
 				AC_MSG_ERROR(libdbus is required))
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
+DBUS_DATADIR="`pkg-config --variable=sysconfdir dbus-1`"
+if (test -z "{DBUS_DATADIR}"); then
+	DBUS_DATADIR="${sysconfdir}/dbus-1/system.d"
+else
+	DBUS_DATADIR="$DBUS_DATADIR/dbus-1/system.d"
+fi
+AC_SUBST(DBUS_DATADIR)
 
 AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus'])
 AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a11f4f..363cfc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-dbusdir = $(sysconfdir)/dbus-1/system.d
+dbusdir = @DBUS_DATADIR@
 
 dbus_DATA = connman.conf