]> git.proxmox.com Git - mirror_lxc.git/commitdiff
add compile flags for dlog
author2xsec <dh48.jeong@samsung.com>
Thu, 13 Sep 2018 02:37:54 +0000 (11:37 +0900)
committer2xsec <dh48.jeong@samsung.com>
Thu, 13 Sep 2018 02:37:54 +0000 (11:37 +0900)
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
lxc.spec.in
src/lxc/Makefile.am

index 87978feb26a43aa8b864198b5ea757786d46a47d..61cb1456f69f5203011989f4cfbd2411e02330a9 100644 (file)
@@ -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
index 08fa8e03a3e19516370de87fae949c773633fbef..aa879500d6a48184d2ef347127399cb5b9baabfd 100644 (file)
@@ -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) \