From: Joe Orton <jorton@apache.org>
Date: Thu, 31 Jul 2014 08:01:07 +0000 (+0000)
Subject: * acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemd
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56bc4333762e53f1a9c7b0a356832636ac4b972b;p=thirdparty%2Fapache%2Fhttpd.git

* 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 054433b16bf..4c5e820ad41 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")