You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2014/07/31 10:01:07 UTC

svn commit: r1614823 - /httpd/httpd/trunk/acinclude.m4

Author: jorton
Date: Thu Jul 31 08:01:07 2014
New Revision: 1614823

URL: http://svn.apache.org/r1614823
Log:
* acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemd
  with pkg-config since libsystemd-daemon is deprecated upstream.

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1614823&r1=1614822&r2=1614823&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Thu Jul 31 08:01:07 2014
@@ -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")