]>
Commit | Line | Data |
---|---|---|
14c009d9 AM |
1 | diff --git a/configure.ac b/configure.ac |
2 | index 0b10fc7de7..1928e65bde 100644 | |
3 | --- a/configure.ac | |
4 | +++ b/configure.ac | |
5 | @@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"]) | |
6 | have_lz4=no | |
7 | AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support])) | |
8 | AS_IF([test "x$enable_lz4" != "xno"], [ | |
9 | - PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ], | |
10 | - [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available]) | |
11 | + PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ], | |
12 | + [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available]) | |
13 | have_lz4=yes], | |
14 | - have_lz4=no) | |
15 | + [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ], | |
16 | + [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available]) | |
17 | + have_lz4=yes], | |
18 | + have_lz4=no)]) | |
19 | AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes], | |
20 | [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])]) | |
21 | ]) | |
82b9d951 JB |
22 | --- systemd-232/Makefile.am.orig 2017-04-05 19:08:21.126447292 +0200 |
23 | +++ systemd-232/Makefile.am 2017-04-05 19:17:46.589774170 +0200 | |
24 | @@ -4255,6 +4255,10 @@ | |
25 | libsystemd-shared.la | |
26 | ||
27 | +test_compress_CFLAGS = | |
28 | if HAVE_LZ4 | |
29 | +test_compress_CFLAGS += \ | |
30 | + $(LZ4_CFLAGS) | |
31 | + | |
32 | test_compress_LDADD += \ | |
33 | -llz4 | |
34 | endif | |
35 | @@ -4402,6 +4405,9 @@ | |
36 | endif | |
37 | ||
38 | if HAVE_LZ4 | |
39 | +libsystemd_journal_internal_la_CFLAGS += \ | |
40 | + $(LZ4_CFLAGS) | |
41 | + | |
42 | libsystemd_journal_internal_la_LIBADD += \ | |
43 | -llz4 | |
44 | endif |