diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 4 insertions, 6 deletions
@@ -140,8 +140,6 @@ Features: * systemd --user should issue sd_notify() upon reaching basic.target, not on becoming idle -* configure.ac pretends dbus was optional but actually hardcodes use of dbus' pkg-config file to determine various dbus dirs such as policy and activation dirs - * consider showing the unit names during boot up in the status output, not just the unit descriptions * dhcp: do we allow configuring dhcp routes on interfaces that are not the one we got the dhcp info from? diff --git a/configure.ac b/configure.ac index 0e7216638c..f20c0e78a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1258,22 +1258,22 @@ AC_SUBST(TTY_GID) AC_ARG_WITH([dbuspolicydir], AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]), [], - [with_dbuspolicydir=$($PKG_CONFIG --variable=sysconfdir dbus-1)/dbus-1/system.d]) + [with_dbuspolicydir=${sysconfdir}/dbus-1/system.d]) AC_ARG_WITH([dbussessionservicedir], AS_HELP_STRING([--with-dbussessionservicedir=DIR], [D-Bus session service directory]), [], - [with_dbussessionservicedir=$($PKG_CONFIG --variable=session_bus_services_dir dbus-1)]) + [with_dbussessionservicedir=${datadir}/dbus-1/services]) AC_ARG_WITH([dbussystemservicedir], AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]), [], - [with_dbussystemservicedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services)]) + [with_dbussystemservicedir=${datadir}/dbus-1/system-services]) AC_ARG_WITH([dbusinterfacedir], AS_HELP_STRING([--with-dbusinterfacedir=DIR], [D-Bus interface directory]), [], - [with_dbusinterfacedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces)]) + [with_dbusinterfacedir=${datadir}/dbus-1/interfaces]) AC_ARG_WITH([bashcompletiondir], AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), |