From 7e20a7242ba2657f73311bbf5278093da67f0721 Mon Sep 17 00:00:00 2001
|
From: Robert Yang <liezhi.yang@windriver.com>
|
Date: Tue, 16 Sep 2014 01:59:08 -0700
|
Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
|
with_selinux
|
|
Fixed when build with meta-selinux even when --without-selinux:
|
runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory
|
# include <selinux/flask.h>
|
^
|
compilation terminated.
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
---
|
m4/gnulib-comp.m4 | 2 +-
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
|
index dead90e..0abf0bd 100644
|
--- a/m4/gnulib-comp.m4
|
+++ b/m4/gnulib-comp.m4
|
@@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT],
|
AC_LIBOBJ([select])
|
fi
|
gl_SYS_SELECT_MODULE_INDICATOR([select])
|
- AC_CHECK_HEADERS([selinux/flask.h])
|
gl_HEADERS_SELINUX_SELINUX_H
|
gl_HEADERS_SELINUX_CONTEXT_H
|
if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
|
+ AC_CHECK_HEADERS([selinux/flask.h])
|
AC_LIBOBJ([getfilecon])
|
fi
|
gl_SERVENT
|
