Mailing List Archive

Re: svn commit: r1876870 - in /httpd/httpd/branches/2.4.x: ./ acinclude.m4
On Thu, Apr 23, 2020 at 08:56:23AM -0000, rjung@apache.org wrote:
> URL: http://svn.apache.org/viewvc?rev=1876870&view=rev
> Log:
> systemd dependencies are only needed by mod_systemd.
> They should currently not be needed by httpd directly
> or any other binary. So no need to add them to
> HTTPD_LIBS.
..
> --- httpd/httpd/branches/2.4.x/acinclude.m4 (original)
> +++ httpd/httpd/branches/2.4.x/acinclude.m4 Thu Apr 23 08:56:23 2020
> @@ -623,7 +623,6 @@ case $host in
> if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
> AC_MSG_WARN([Your system does not support systemd.])
> else
> - APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
> AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
> fi
> fi

I think this is wrong on trunk but right on 2.4.x, as seen in Travis =>

trunk: FAIL https://travis-ci.org/github/apache/httpd/builds/678511325
2.4.x: PASS https://travis-ci.org/github/apache/httpd/builds/678512386

On trunk, systemd socket activation support is in the core so httpd
should be linked against $SYSTEMD_LIBS if built with systemd support.

On 2.4.x mod_systemd has been backported but socket activation has not,
so this is correct.

Also I don't think 2.4.x Unix buildsystem changes are CTR ;)

tl;dr: +1 for 2.4.x, -1 for trunk.

Regards, Joe