[PATCH v2] xserver: Fix configure.ac check for libsystemd/-daemon

[Adam Jackson]

On Fri, 2015-12-04 at 12:30 +0000, Bob Ham wrote:
> The configure script looks for the libsystemd-daemon pkg-config
> module.  If the configure script finds it, the script will add
> libsystemd-daemon to a list of modules which are used to consolidate
> CFLAGS and LIBS.
> 
> The check for libsystemd-daemon was altered to fallback to libsystemd
> if libsystemd-daemon was not found (libsystemd-daemon was brought into
> libsystemd).  Unfortunately, the configure script still adds
> "libsystemd-daemon" to the list of modules to consolidate, instead of
> "libsystemd".  With this patch, we set a variable depending on which
> pkg-config module is found and add that to the module list instead.
> 
> Changes since v1:
> - Rearranged logic so that we do a versioned check for libsystemd
>   first, then look for libsystemd-daemon.
> - Cleaned up the check a bit, only performing the module checks if we
>   don't have --with-systemd-daemon=no, in a similar style to
>   --with-dtrace.
> - Changed the variable name to LIBSYSTEMD_DAEMON as per feedback.
> 
> Signed-off-by: Bob Ham <bob.ham at collabora.com>

Merged:

remote: I: patch #67139 updated using rev 7c0ba32ddd5f1d5c65279365fa307dec3433caf3.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   530d3e5..7c0ba32  master -> master

- ajax