diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-09-21 19:08:31 +0900 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-09-21 19:08:31 +0900 |
| commit | 8fd30c02676ecdab0380b6bfe7f20317c2726234 (patch) | |
| tree | acc8eb9e086e3bc264700426386577fe507ecf4b /configure.ac | |
| parent | 5fb34c4e1471976502f7d5f8d7e8354670783e96 (diff) | |
| download | pacrunner-8fd30c02676ecdab0380b6bfe7f20317c2726234.tar.gz | |
Add D-Bus autostart configuration
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 57e0769..6a2ecad 100644 --- a/configure.ac +++ b/configure.ac @@ -61,13 +61,23 @@ AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes, AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -AC_ARG_WITH(dbusconf, AC_HELP_STRING([--with-dbusconf=PATH], +AC_ARG_WITH(dbusconfdir, AC_HELP_STRING([--with-dbusconfdir=PATH], [path to D-Bus config directory]), [path_dbusconf=${withval}], [path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"]) if (test -z "${path_dbusconf}"); then - DBUS_DATADIR="${sysconfdir}/dbus-1/system.d" + DBUS_CONFDIR="${sysconfdir}/dbus-1/system.d" else - DBUS_DATADIR="${path_dbusconf}/dbus-1/system.d" + DBUS_CONFDIR="${path_dbusconf}/dbus-1/system.d" +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) @@ -104,4 +114,4 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [enable_datafiles=${enableval}]) AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile src/pacrunner.service) |