From: 2xsec <dh48.jeong@samsung.com>
Date: Thu, 13 Sep 2018 02:37:54 +0000 (+0900)
Subject: add compile flags for dlog
X-Git-Tag: lxc-3.1.0~111^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8eed52c173f90aed27a390460542fc13bb375b9;p=thirdparty%2Flxc.git

add compile flags for dlog

Signed-off-by: 2xsec <dh48.jeong@samsung.com>
---

diff --git a/lxc.spec.in b/lxc.spec.in
index 87978feb2..61cb1456f 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -91,6 +91,13 @@ BuildRequires:  libseccomp-devel
 %endif
 %endif
 
+#
+# Additional package for Tizen
+#
+%if %{defined tizen_version}
+BuildRequires:  pkgconfig(dlog)
+%endif
+
 %description
 Containers are insulated areas inside a system, which have their own namespace
 for filesystem, network, PID, IPC, CPU and memory allocation and which can be
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 08fa8e03a..aa879500d 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -212,7 +212,8 @@ AM_CFLAGS += -DHAVE_SELINUX
 endif
 
 if ENABLE_DLOG
-AM_CFLAGS += -DHAVE_DLOG
+AM_CFLAGS += -DHAVE_DLOG \
+	      $(DLOG_CFLAGS)
 endif
 
 if USE_CONFIGPATH_LOGS
@@ -233,7 +234,8 @@ liblxc_la_LDFLAGS = -pthread \
 liblxc_la_LIBADD = $(CAP_LIBS) \
 		   $(GNUTLS_LIBS) \
 		   $(SELINUX_LIBS) \
-		   $(SECCOMP_LIBS)
+		   $(SECCOMP_LIBS) \
+		   $(DLOG_LIBS)
 
 bin_SCRIPTS=
 
@@ -285,7 +287,8 @@ LDADD = liblxc.la \
 	@CAP_LIBS@ \
 	@GNUTLS_LIBS@ \
 	@SECCOMP_LIBS@ \
-	@SELINUX_LIBS@
+	@SELINUX_LIBS@ \
+	@DLOG_LIBS@
 
 if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c \
@@ -421,6 +424,7 @@ pam_cgfs_la_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
 
 pam_cgfs_la_LIBADD = $(AM_LIBS) \
 		     $(PAM_LIBS) \
+		     $(DLOG_LIBS) \
 		     -L$(top_srcdir)
 
 pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \