diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-05 13:35:22 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-08 13:54:31 +0200 |
| commit | 9735bd12ab7668cc1b7b518299797b101f16bd58 (patch) | |
| tree | a46a568f986c7292466eef1ae84991f516c350b9 /src/libsystemd-daemon/sd-daemon.c | |
| parent | 23e97f7d9274b90fb0e1664945dc6259fdae6d39 (diff) | |
sd-daemon.c: allow use of -lrt to be avoided
In recent glibc, many commonly-used librt functions have moved
from librt to libc. This results in dbus' configure.ac
concluding that we don't need to link in librt. However,
sd-daemon.c needs it for mq_getattr(), causing the build
to fail.
dbus doesn't use POSIX message queues, so I'd prefer to be
able to avoid "if on Linux, link librt for sd-daemon.c".
Diffstat (limited to 'src/libsystemd-daemon/sd-daemon.c')
| -rw-r--r-- | src/libsystemd-daemon/sd-daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-daemon/sd-daemon.c b/src/libsystemd-daemon/sd-daemon.c index b1ff43132a..9cc1c37b46 100644 --- a/src/libsystemd-daemon/sd-daemon.c +++ b/src/libsystemd-daemon/sd-daemon.c @@ -47,7 +47,7 @@ #include <stddef.h> #include <limits.h> -#if defined(__linux__) +#if defined(__linux__) && !defined(SD_DAEMON_DISABLE_MQ) # include <mqueue.h> #endif @@ -387,7 +387,7 @@ _sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *p } _sd_export_ int sd_is_mq(int fd, const char *path) { -#if !defined(__linux__) +#if !defined(__linux__) || defined(SD_DAEMON_DISABLE_MQ) return 0; #else struct mq_attr attr; |