Blob Blame History Raw
From aeca36572c02a8bf314037d82c4a2625636b175a Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Mon, 3 Jun 2019 14:36:48 -0700
Subject: [PATCH] fix iscsiuio build with libsystemd

---
 iscsiuio/configure.ac         | 2 ++
 iscsiuio/src/unix/Makefile.am | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
index ae23078..6138e0e 100644
--- a/iscsiuio/configure.ac
+++ b/iscsiuio/configure.ac
@@ -73,6 +73,8 @@ AC_CONFIG_COMMANDS([default],[[
     echo 'char *build_date;'> src/unix/build_date.h
 ]],[[]])
 
+PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd])
+
 AC_PREFIX_DEFAULT()
 
 AC_OUTPUT([Makefile
diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am
index a989ef0..ea5f59e 100644
--- a/iscsiuio/src/unix/Makefile.am
+++ b/iscsiuio/src/unix/Makefile.am
@@ -25,7 +25,8 @@ iscsiuio_SOURCES =	build_date.c		\
 
 iscsiuio_CFLAGS = 	$(AM_CFLAGS)		\
 			$(LIBNL_CFLAGS)		\
-			-DBYTE_ORDER=@ENDIAN@
+			-DBYTE_ORDER=@ENDIAN@   \
+			$(LIBSYSTEMD_CFLAGS)
 
 iscsiuio_LDFLAGS= 	$(AM_LDADD)		\
 			-ldl			\
@@ -36,6 +37,7 @@ iscsiuio_LDFLAGS= 	$(AM_LDADD)		\
 iscsiuio_LDADD  = 	${top_srcdir}/src/uip/lib_iscsi_uip.a	\
 			${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
 			${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \
-			${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
+			${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a \
+			$(LIBSYSTEMD_LIBS)
 
 iscsiuio_YFLAGS = -d
-- 
2.21.0