X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f91c78658d12c064f77f3feae55cda97a0462618;hp=ff69bb93d24fb5fe5e9b85281b96a661eb220e54;hb=91fd0103cc1525c66e3efb03ef781e9553437724;hpb=244477333afc8b95d2a5b2c05b7d8fe8b1be89c0

diff --git a/Makefile.am b/Makefile.am
index ff69bb93d..f91c78658 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1352,8 +1352,12 @@ manual_tests += \
 	test-watchdog \
 	test-log \
 	test-ipcrm \
-	test-btrfs \
+	test-btrfs
+
+if HAVE_LIBIPTC
+manual_tests += \
 	test-fw-util
+endif
 
 if HAVE_KMOD
 manual_tests += \
@@ -1834,6 +1838,7 @@ test_btrfs_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+if HAVE_LIBIPTC
 test_fw_util_SOURCES = \
 	src/test/test-fw-util.c
 
@@ -1845,6 +1850,7 @@ test_fw_util_LDADD = \
 	libsystemd-fw.la \
 	libsystemd-shared.la \
 	$(LIBIPTC_LIBS)
+endif
 
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
@@ -5227,17 +5233,43 @@ systemd_import_SOURCES = \
 	src/import/curl-util.c \
 	src/import/curl-util.h \
 	src/import/aufs-util.c \
-	src/import/aufs-util.h
+	src/import/aufs-util.h \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
 
 systemd_import_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(LIBCURL_CFLAGS)
+	$(LIBCURL_CFLAGS) \
+	$(XZ_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 systemd_import_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	$(LIBCURL_LIBS)
+	$(LIBCURL_LIBS) \
+	$(XZ_LIBS) \
+	$(ZLIB_LIBS)
+
+endif
+
+if HAVE_ZLIB
+manual_tests += \
+	test-qcow2
+
+test_qcow2_SOURCES = \
+	src/import/test-qcow2.c \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
+
+test_qcow2_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(ZLIB_CFLAGS)
+
+test_qcow2_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	$(ZLIB_LIBS)
 endif
 
 endif
@@ -5518,6 +5550,11 @@ test_network_tables_LDADD = \
 	libsystemd-networkd-core.la \
 	libudev-core.la
 
+if HAVE_LIBIPTC
+test_network_tables_LDADD += \
+	libsystemd-fw.la
+endif
+
 tests += \
 	test-network \
 	test-network-tables