diff options
| author | Jan Kaluža <jkaluza@apache.org> | 2015-04-23 18:29:38 +0000 |
|---|---|---|
| committer | Jan Kaluža <jkaluza@apache.org> | 2015-04-23 18:29:38 +0000 |
| commit | 38a56eedba70660d277ad56bbaad991bf4dbe8da (patch) | |
| tree | 80991928a8ee3bc0d0a88f35ebb97e15f2031b64 /modules/loggers | |
| parent | 391e101721b7d5d49187bf4fceaf18d59aecb446 (diff) | |
| download | httpd-38a56eedba70660d277ad56bbaad991bf4dbe8da.tar.gz | |
* mod_journald: use -lsystemd instead of -lsystemd-journald when found
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675701 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/loggers')
| -rw-r--r-- | modules/loggers/config.m4 | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4 index c66e4d3268..30318626ba 100644 --- a/modules/loggers/config.m4 +++ b/modules/loggers/config.m4 @@ -5,16 +5,23 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]]) APACHE_MODPATH_INIT(loggers) APACHE_MODULE(journald, Journald support, , , all, [ - AC_CHECK_LIB(systemd-journal, sd_journal_sendv, JOURNALD_LIBS="-lsystemd-journal") - AC_CHECK_LIB(systemd-id128, sd_id128_to_string, ID128_LIBS="-lsystemd-id128") + new_systemd_found="yes" + AC_CHECK_LIB(systemd, sd_journal_sendv, JOURNALD_LIBS="-lsystemd") + if test -z "${JOURNALD_LIBS}"; then + new_systemd_found="no" + AC_CHECK_LIB(systemd-journal, sd_journal_sendv, JOURNALD_LIBS="-lsystemd-journal") + AC_CHECK_LIB(systemd-id128, sd_id128_to_string, ID128_LIBS="-lsystemd-id128") + fi AC_CHECK_HEADERS(systemd/sd-journal.h, [ap_HAVE_SD_JOURNAL_H="yes"], [ap_HAVE_SD_JOURNAL_H="no"]) AC_CHECK_HEADERS(systemd/sd-id128.h, [ap_HAVE_SD_ID128_H="yes"], [ap_HAVE_SD_ID128_H="no"]) - if test $ap_HAVE_SD_JOURNAL_H = "no" || test $ap_HAVE_SD_ID128_H = "no" || test -z "${JOURNALD_LIBS}" || test -z "${ID128_LIBS}"; then + if test $ap_HAVE_SD_JOURNAL_H = "no" || test $ap_HAVE_SD_ID128_H = "no" || test -z "${JOURNALD_LIBS}" || (test $new_systemd_found = "no" && test -z "${ID128_LIBS}"); then AC_MSG_WARN([Your system does not support Journald.]) enable_journald="no" else APR_ADDTO(MOD_JOURNALD_LDADD, [$JOURNALD_LIBS]) - APR_ADDTO(MOD_JOURNALD_LDADD, [$ID128_LIBS]) + if test $new_systemd_found = "no"; then + APR_ADDTO(MOD_JOURNALD_LDADD, [$ID128_LIBS]) + fi enable_journald="yes" fi ]) |