blob: 4f126ad67c6442dbdc3b3dd1f50707c38d30eff8 [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From b04363018b4b9b45fdf23384f30d02caa5564602 Mon Sep 17 00:00:00 2001
Patrick Williamsc124f4f2015-09-15 14:41:29 -05002From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 16 Sep 2014 01:59:08 -0700
4Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
5 with_selinux
6
7Fixed when build with meta-selinux even when --without-selinux:
8runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory
9 # include <selinux/flask.h>
10 ^
11compilation terminated.
12
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Andrew Geissler4b740dc2020-05-05 08:54:39 -050016
Patrick Williamsc124f4f2015-09-15 14:41:29 -050017---
Andrew Geissler4b740dc2020-05-05 08:54:39 -050018 m4/gnulib-comp.m4 | 2 +-
Patrick Williamsc124f4f2015-09-15 14:41:29 -050019 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
Andrew Geisslereff27472021-10-29 15:35:00 -050022index 3857233..c01fb30 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050023--- a/m4/gnulib-comp.m4
24+++ b/m4/gnulib-comp.m4
Andrew Geisslereff27472021-10-29 15:35:00 -050025@@ -1953,11 +1953,11 @@ AC_DEFUN([gl_INIT],
Patrick Williamsc124f4f2015-09-15 14:41:29 -050026 AC_LIBOBJ([select])
27 fi
28 gl_SYS_SELECT_MODULE_INDICATOR([select])
29- AC_CHECK_HEADERS([selinux/flask.h])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050030 gl_HEADERS_SELINUX_SELINUX_H
31 gl_HEADERS_SELINUX_CONTEXT_H
Andrew Geisslereff27472021-10-29 15:35:00 -050032 gl_HEADERS_SELINUX_LABEL_H
Patrick Williamsc124f4f2015-09-15 14:41:29 -050033 if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
34+ AC_CHECK_HEADERS([selinux/flask.h])
35 AC_LIBOBJ([getfilecon])
36 fi
37 gl_SERVENT