From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 4 Jan 2012 18:36:45 +0000 (+0100)
Subject: journal: fix XZ build flags
X-Git-Tag: v38~71
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=96d1efbabeecef9a7e079e5b92d9ee04619cfa65;hp=8df5c320a502786834a715eb30dc763ad74670e8;p=elogind.git

journal: fix XZ build flags
---

diff --git a/Makefile.am b/Makefile.am
index b778b1a2c..7962db032 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1203,6 +1203,7 @@ if HAVE_XZ
 systemd_journalctl_SOURCES += \
 	src/journal/compress.c
 systemd_journalctl_CFLAGS = \
+        $(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 systemd_journalctl_LDADD += \
 	$(XZ_LIBS)
@@ -1224,6 +1225,7 @@ test_journal_SOURCES += \
 	src/journal/compress.c
 
 test_journal_CFLAGS = \
+        $(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 test_journal_LDADD += \
@@ -1233,13 +1235,11 @@ endif
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/journal/journal-file.c \
-	src/journal/compress.c \
 	src/journal/lookup3.c \
 	src/journal/journal-send.c
 
 libsystemd_journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(XZ_CFLAGS) \
 	-fvisibility=hidden
 
 libsystemd_journal_la_LDFLAGS = \
@@ -1249,8 +1249,18 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
 	libsystemd-basic.la \
-	libsystemd-id128.la \
+	libsystemd-id128.la
+
+if HAVE_XZ
+libsystemd_journal_la_SOURCES += \
+	src/journal/compress.c
+
+libsystemd_journal_la_CFLAGS += \
+	$(XZ_CFLAGS)
+
+libsystemd_journal_la_LIBADD += \
 	$(XZ_LIBS)
+endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook: