diff options
| author | Umut Tezduyar Lindskog <umut@tezduyar.com> | 2014-09-02 09:02:31 +0200 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-12 12:24:18 +0100 |
| commit | ae268a2b1aaa14e16ffc47b3cd5ad74a26e39838 (patch) | |
| tree | 65d6c75c0f656c6ba489d5ec41af645470002b8c | |
| parent | 575256cd48d583f2d6409c43a10a572939a01b00 (diff) | |
| download | dbus-ae268a2b1aaa14e16ffc47b3cd5ad74a26e39838.tar.gz | |
enable build support without systemd compatibility libraries
systemd 209 merged all the libraries to libsystemd. Old
libraries can still be enabled with --enable-compat-libs
switch in systemd but this increases the binary size.
Implement a fallback library check in case compat libraries
dont exist.
[Fixed underquoting; switched priority so we try libsystemd first -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5412db2e..b7b91bec 100644 --- a/configure.ac +++ b/configure.ac @@ -1143,10 +1143,13 @@ dnl systemd detection if test x$enable_systemd = xno ; then have_systemd=no; else - PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32], - have_systemd=yes, - have_systemd=no) + PKG_CHECK_MODULES([SYSTEMD], + [libsystemd >= 209], + [have_systemd=yes], + [PKG_CHECK_MODULES([SYSTEMD], + [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32], + [have_systemd=yes], + [have_systemd=no])]) fi if test x$have_systemd = xyes; then |