From a499582993cae8f4e005076eec7d0453ebbb0956 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 2 Oct 2010 17:57:19 +0200
Subject: [PATCH] build: Add D-Bus service autostart support

---
 Makefile.am          |  4 ++++
 configure.ac         | 12 +++++++++++-
 src/ofono.service.in |  4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/ofono.service.in

diff --git a/Makefile.am b/Makefile.am
index cb81ee9a..ffebcfdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,10 @@ dbusconfdir = @DBUS_CONFDIR@
 
 dbusconf_DATA = src/ofono.conf
 
+dbusdatadir = @DBUS_DATADIR@
+
+dbusdata_DATA = src/ofono.service
+
 confdir = $(sysconfdir)/ofono
 
 conf_DATA =
diff --git a/configure.ac b/configure.ac
index ea5c272b..1b9d07c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,16 @@ else
 fi
 AC_SUBST(DBUS_CONFDIR)
 
+AC_ARG_WITH(dbusdatadir, AC_HELP_STRING([--with-dbusdatadir=PATH],
+	[path to D-Bus data directory]), [path_dbusdata=${withval}],
+		[path_dbusdata="`$PKG_CONFIG --variable=datadir dbus-1`"])
+if (test -z "${path_dbusdata}"); then
+	DBUS_DATADIR="${datadir}/dbus-1/system-services"
+else
+	DBUS_DATADIR="${path_dbusdata}/dbus-1/system-services"
+fi
+AC_SUBST(DBUS_DATADIR)
+
 AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng],
 		[enable capabilities support]), [enable_capng=${enableval}])
 if (test "${enable_capng}" = "yes"); then
@@ -173,4 +183,4 @@ fi
 AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}",
 			[Directory for the configuration files])
 
-AC_OUTPUT(Makefile include/version.h)
+AC_OUTPUT(Makefile include/version.h src/ofono.service)
diff --git a/src/ofono.service.in b/src/ofono.service.in
new file mode 100644
index 00000000..2eecbf93
--- /dev/null
+++ b/src/ofono.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.ofono
+Exec=@prefix@/sbin/ofonod
+User=root