diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2016-05-03 16:59:49 +0100 |
|---|---|---|
| committer | Wei Liu <wei.liu2@citrix.com> | 2016-05-04 16:31:16 +0100 |
| commit | 7dec5b0c658bea9c16a0e3c051e64d2abf57be48 (patch) | |
| tree | e5969c443c0195c1a1df9542c68bdf05d843d155 /m4 | |
| parent | a50ea9cb56add9b29e81f85e197b59b9a41114e2 (diff) | |
| download | xen-7dec5b0c658bea9c16a0e3c051e64d2abf57be48.tar.gz | |
configure: Fix when no libsystemd compat lib are available
From systemd change log, since version 209, libsystemd.so contain
everything, including libsystemd-daemon.so. Distro may, or may not provide
the compatibility libraries which libsystemd-daemon is part of.
So, if libsystemd-daemon is not available, check for the presence of
a recent enough libsystemd.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
[ wei: run autogen.sh ]
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/systemd.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/m4/systemd.m4 b/m4/systemd.m4 index e4b1aa5800..112dc11b5e 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -41,7 +41,9 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],, + [PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])] + ) dnl pkg-config older than 0.24 does not set these for dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 dnl of systemd pkg-config --cflags currently yields no extra flags yet. @@ -94,8 +96,10 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"], - [systemd="n"]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"],[ + PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], + [systemd="y"],[systemd="n"]) + ]) ]) dnl Enables systemd by default and requires a --disable-systemd option flag |