Rebuild.

[apache] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 054433b16bf82360dcaecefc02afa66cffc7c232..e2f8c22e575c741ec8f3ce53336bd58456534289 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -292,9 +292,9 @@ DISTCLEAN_TARGETS = modules.mk
 static =
 shared = $libname
 EOF
+            DSO_MODULES="$DSO_MODULES mpm_$1"
             # add default MPM to LoadModule list
             if test $1 = $default_mpm; then
-                DSO_MODULES="$DSO_MODULES mpm_$1"
                 ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1"
             fi
         fi
@@ -657,8 +657,10 @@ 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
-      SYSTEMD_LIBS=`pkg-config --libs libsystemd-daemon`
+   if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd; then
+      SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
+   elif test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then
+      SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd-daemon`
    else
       AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
    fi