From: Joe Orton <jorton@apache.org>
Date: Tue, 14 Jan 2020 12:50:12 +0000 (+0000)
Subject: * modules/loggers/config.m4, modules/md/config2.m4, acinclude.m4:
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1701
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0a2ea7ec2dfeaa1489807297abda5e9c8975085;p=thirdparty%2Fapache%2Fhttpd.git

* 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
---

diff --git a/acinclude.m4 b/acinclude.m4
index d57e7f7bb9d..4890ae91e94 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 f4e908fe24b..ea43526d091 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 14898c51df5..e47937c1e33 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])