diff options
| author | Sami Kerola | 2014-01-07 00:39:08 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-01-07 12:17:37 +0100 |
| commit | ea45d34c7c8e2c9017c3e0ee57c202928157a482 (patch) | |
| tree | 8a543ef4c045d7992efa509e012627f67d63d105 /configure.ac | |
| parent | unshare: Add possibility to add mapping into root user in user namespace (diff) | |
| download | kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.tar.gz kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.tar.xz kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.zip | |
uuidd: use pkg-config to find systemd-deamon support
[kzak@redhat.com: - remove USE_SOCKET_ACTIVATION and use
HAVE_* as we use for another libs]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 5444cd3e6..6bf50480a 100644 --- a/configure.ac +++ b/configure.ac @@ -1389,12 +1389,15 @@ AC_ARG_ENABLE([socket-activation], AS_HELP_STRING([--enable-socket-activation], [build uuidd with support for systemd socket activation]), [], [enable_socket_activation=no] ) - -AM_CONDITIONAL([USE_SOCKET_ACTIVATION], [test "x$enable_socket_activation" = xyes]) - +have_systemd_daemon=no AS_IF([test "x$enable_socket_activation" = xyes], [ - AC_DEFINE([USE_SOCKET_ACTIVATION], [1], [Should uuidd support socket activation?]) + PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], [], [ + AC_MSG_ERROR([cannot find libsystemd-daemon support]) + ]) + have_systemd_daemon=yes + AC_DEFINE([HAVE_LIBSYSTEMD_DAEMON], [1], [Define if libsystemd-daemon is available]) ]) +AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$have_systemd_daemon" = xyes]) AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [directory for systemd service files]), @@ -1404,8 +1407,6 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ]) -AM_CONDITIONAL([HAVE_SYSTEMD], [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ]) - AC_ARG_WITH([smack], AS_HELP_STRING([--with-smack], [build with SMACK support]), |