diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-03 22:42:22 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-06 19:06:03 -0400 |
| commit | d89c8fdf48c7bad5816b9f2e77e8361721f22517 (patch) | |
| tree | 12d384fffafa1789079b7ed51c4d33d5d10116c0 /Makefile.am | |
| parent | 5e592c66bdf76dfc8445b332f7a5088ca504ee90 (diff) | |
journal: add LZ4 as optional compressor
Add liblz4 as an optional dependency when requested with --enable-lz4,
and use it in preference to liblzma for journal blob and coredump
compression. To retain backwards compatibility, XZ is used to
decompress old blobs.
Things will function correctly only with lz4-119.
Based on the benchmarks found on the web, lz4 seems to be the best
choice for "quick" compressors atm.
For pkg-config status, see http://code.google.com/p/lz4/issues/detail?id=135.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index e238cdeebf..01afbe3a22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3530,14 +3530,12 @@ test_catalog_CPPFLAGS = \ test_catalog_LDADD = \ libsystemd-journal-core.la -if HAVE_XZ test_compress_SOURCES = \ src/journal/test-compress.c test_compress_LDADD = \ libsystemd-journal-internal.la \ libsystemd-shared.la -endif libsystemd_journal_core_la_SOURCES = \ src/journal/journald-kmsg.c \ @@ -3621,9 +3619,7 @@ tests += \ test-mmap-cache \ test-catalog -if HAVE_XZ tests += test-compress -endif pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -3656,10 +3652,10 @@ libsystemd_journal_internal_la_CFLAGS = \ libsystemd_journal_internal_la_LIBADD = -if HAVE_XZ libsystemd_journal_internal_la_SOURCES += \ src/journal/compress.c +if HAVE_XZ libsystemd_journal_internal_la_CFLAGS += \ $(XZ_CFLAGS) @@ -3667,6 +3663,11 @@ libsystemd_journal_internal_la_LIBADD += \ $(XZ_LIBS) endif +if HAVE_LZ4 +libsystemd_journal_internal_la_LIBADD += \ + -llz4 +endif + if HAVE_GCRYPT libsystemd_journal_internal_la_SOURCES += \ src/journal/journal-authenticate.c \ |