shared: make timezone and locale enumeration and validation generic

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e238cdeebfcb1960e724d6b294f9a1b772a2db80..0bf803a1f366dbe36234f9cf69aa9255221c6f70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -727,6 +727,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/path-util.h \
        src/shared/time-util.c \
        src/shared/time-util.h \
+       src/shared/locale-util.c \
+       src/shared/locale-util.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
        src/shared/siphash24.c \
@@ -3530,14 +3532,19 @@ 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
+
+test_compress_benchmark_SOURCES = \
+       src/journal/test-compress-benchmark.c
+
+test_compress_benchmark_LDADD = \
+       libsystemd-journal-internal.la \
+       libsystemd-shared.la
 
 libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-kmsg.c \
@@ -3621,9 +3628,9 @@ tests += \
        test-mmap-cache \
        test-catalog
 
-if HAVE_XZ
-tests += test-compress
-endif
+tests += \
+       test-compress \
+       test-compress-benchmark
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -3656,10 +3663,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 +3674,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 \