diff options
| author | Joe Orton <jorton@apache.org> | 2020-01-14 13:50:12 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-01-14 13:50:12 +0100 |
| commit | c0a2ea7ec2dfeaa1489807297abda5e9c8975085 (patch) | |
| tree | b100db0c092aab00e770ab447c37512a8b59c5a4 | |
| parent | Transforms. [skip ci] (diff) | |
| download | apache2-c0a2ea7ec2dfeaa1489807297abda5e9c8975085.tar.xz apache2-c0a2ea7ec2dfeaa1489807297abda5e9c8975085.zip | |
* 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)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872776 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | modules/loggers/config.m4 | 1 | ||||
| -rw-r--r-- | modules/md/config2.m4 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d57e7f7bb9..4890ae91e9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4 index f4e908fe24..ea43526d09 100644 --- a/modules/loggers/config.m4 +++ b/modules/loggers/config.m4 @@ -44,6 +44,7 @@ APACHE_MODULE(log_json, logging in jsonn, , , most, [ enable_log_json="no" else enable_log_json="yes" + APR_ADDTO(MOD_LOG_JSON_LDADD, [$ap_jansson_libs]) fi ]) diff --git a/modules/md/config2.m4 b/modules/md/config2.m4 index 14898c51df..e47937c1e3 100644 --- a/modules/md/config2.m4 +++ b/modules/md/config2.m4 @@ -183,6 +183,8 @@ APACHE_MODULE(md, [Managed Domain handling], $md_objs, , most, [ 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]) |