* 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

diff --git a/acinclude.m4 b/acinclude.m4
index 054433b16bf82360dcaecefc02afa66cffc7c232..4c5e820ad41cd7efe62283d864fe57e7e7cd28ea 100644 (file)
--- 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")