On Fri, Feb 21, 2014 at 07:25:30PM +0000, Sami Kerola wrote:
> bash-completion/logger | 4 +--
> configure.ac | 16 ++++++++++++
> misc-utils/Makemodule.am | 4 +++
> misc-utils/logger.1 | 29 ++++++++++++++++++++-
> misc-utils/logger.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-
> 5 files changed, 115 insertions(+), 4 deletions(-)
Fixed & applied, thanks.
> +AC_ARG_ENABLE([journald],
> + AS_HELP_STRING([--enable-journald], [add journald support to logger]),
> + [], [enable_journald=no]
> +)
> +have_journald=no
> +AS_IF([test "x$enable_journald" = xyes], [
> + PKG_CHECK_MODULES([SYSTEMD_JOURNAL], [libsystemd-journal], [], [
> + AC_MSG_ERROR([cannot find libsystemd-journal support])
> + ])
> + have_journald=yes
> + AC_DEFINE([HAVE_JOURNALD], [1], [Define if journald is available])
> +])
> +AM_CONDITIONAL([HAVE_JOURNALD], [test "x$have_journald" = xyes])
Hmm, the latest systemd release merged all the libs to the one
libsystemd, so it will be necessary to improve our configure.ac
... probably just add --enable-systemd and have_systemd= and
add fallbacks old versions with libsystemd-{journal,daemon} and
remove --enable-journald etc.
> + iovec = malloc(vectors * sizeof(struct iovec));
xalloc.h :-)
> + if (jfd) {
> + int ret = journald_entry(jfd);
> + if (stdin != jfd)
> + fclose(jfd);
> + if (ret == 0)
> + return EXIT_SUCCESS;
> + return EXIT_FAILURE;
> + }
#ifdef HAVE_JOURNALD ^^^
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
