Add support for installing D-Bus autostart configuration

diff --git a/Makefile.am b/Makefile.am
index cb377ca..a49bc59 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,10 @@ if DATAFILES
 dbusconfdir = @DBUS_CONFDIR@
 
 dbusconf_DATA = src/connman.conf
+
+dbusdatadir = @DBUS_DATADIR@
+
+dbusdata_DATA = src/connman.service
 endif
 
 plugin_LTLIBRARIES =

diff --git a/configure.ac b/configure.ac
index 4620a8c..dca40b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -306,6 +306,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(polkit,
        AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]),
                        [enable_polkit=${enableval}], [enable_polkit="no"])