diff options
| author | Joe Orton <jorton@apache.org> | 2014-07-31 10:01:07 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2014-07-31 10:01:07 +0200 |
| commit | 81eecb045b863d349f57a8dea9aa5fcfe898709f (patch) | |
| tree | 377c1202ab37c09a3241d1b658dda1b10e85edd0 /acinclude.m4 | |
| parent | * configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD (diff) | |
| download | apache2-81eecb045b863d349f57a8dea9aa5fcfe898709f.tar.xz apache2-81eecb045b863d349f57a8dea9aa5fcfe898709f.zip | |
* acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemd
with pkg-config since libsystemd-daemon is deprecated upstream.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614823 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 054433b16b..4c5e820ad4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -657,7 +657,9 @@ AC_DEFUN(APACHE_CHECK_SYSTEMD, [ dnl Check for systemd support for listen.c's socket activation. case $host in *-linux-*) - if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then + if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd; then + SYSTEMD_LIBS=`pkg-config --libs libsystemd` + elif test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then SYSTEMD_LIBS=`pkg-config --libs libsystemd-daemon` else AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") |