[systemd-devel] [PATCH 1/2] build-sys: do not use pkgconfig dbus-1.pc to find dbus directories

[Filipe Brandenburger]

Ping?

This was discussed before and I think it's the one thing we need to
remove the dependencies on dbus-devel...

(See also patch 2/2 of this series which gets rid of
--dbusinterfacedir which is not used anywhere. We might also want to
change detection of dbus libs in configure.ac but I'd say we start
with these and go from here.)

Cheers,
Filipe

On Fri, Dec 12, 2014 at 4:55 PM, Filipe Brandenburger
<filbranden at google.com> wrote:
> Do not use the dbus-1.pc pkgconfig settings to determine dbus directories. Use
> directories relative to ${sysconfdir} and ${datadir} instead.
>
> This approach was suggested by Simon McVittie in:
> http://lists.freedesktop.org/archives/systemd-devel/2014-October/024388.html
>
> Tested by building and installing systemd without the dbus-devel installed.
> Without this patch, the dbus files and directories end up in the root of the
> filesystem. With this patch, they end up in the same locations as previously
> (assuming default ${sysconfdir} and ${datadir}) whether dbus-devel is present
> or not. Also made sure that `make check` works without dbus-devel installed.
> ---
>  configure.ac | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index e14f3cf..cf9925e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1253,22 +1253,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]),
> --
> 1.8.3.1
>