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 2020/01/14 12:50:12 UTC
svn commit: r1872776 - in /httpd/httpd/trunk: acinclude.m4
modules/loggers/config.m4 modules/md/config2.m4
Author: jorton
Date: Tue Jan 14 12:50:12 2020
New Revision: 1872776
URL: http://svn.apache.org/viewvc?rev=1872776&view=rev
Log:
* modules/loggers/config.m4, modules/md/config2.m4, acinclude.m4:
Correctly link mod_md and mod_log_json (and no other objects)
against -ljansson. Removes unnecessary deps on libjansson
from other linked objects, and fixes mod_md static build. (see
https://travis-ci.org/apache/httpd/jobs/636789380)
Modified:
httpd/httpd/trunk/acinclude.m4
httpd/httpd/trunk/modules/loggers/config.m4
httpd/httpd/trunk/modules/md/config2.m4
Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1872776&r1=1872775&r2=1872776&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Tue Jan 14 12:50:12 2020
@@ -1078,8 +1078,6 @@ AC_DEFUN([APACHE_CHECK_JANSSON],[
if test "x$ac_cv_jansson" = "xyes"; then
ap_jansson_libs="${ap_jansson_libs:--ljansson} `$apr_config --libs`"
- APR_ADDTO(MOD_LDFLAGS, [$ap_jansson_libs])
- APR_ADDTO(LIBS, [$ap_jansson_libs])
fi
dnl restore
Modified: httpd/httpd/trunk/modules/loggers/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/config.m4?rev=1872776&r1=1872775&r2=1872776&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/config.m4 (original)
+++ httpd/httpd/trunk/modules/loggers/config.m4 Tue Jan 14 12:50:12 2020
@@ -44,6 +44,7 @@ APACHE_MODULE(log_json, logging in jsonn
enable_log_json="no"
else
enable_log_json="yes"
+ APR_ADDTO(MOD_LOG_JSON_LDADD, [$ap_jansson_libs])
fi
])
Modified: httpd/httpd/trunk/modules/md/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/config2.m4?rev=1872776&r1=1872775&r2=1872776&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/config2.m4 (original)
+++ httpd/httpd/trunk/modules/md/config2.m4 Tue Jan 14 12:50:12 2020
@@ -183,6 +183,8 @@ APACHE_MODULE(md, [Managed Domain handli
enable_md=no
fi
+ APR_ADDTO(MOD_MD_LDADD, [$ap_jansson_libs])
+
APACHE_CHECK_CURL
if test "x$ac_cv_curl" != "xyes" ; then
AC_MSG_WARN([libcurl not found])