Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame^] | 1 | From 7e20a7242ba2657f73311bbf5278093da67f0721 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Tue, 16 Sep 2014 01:59:08 -0700 |
| 4 | Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to |
| 5 | with_selinux |
| 6 | |
| 7 | Fixed when build with meta-selinux even when --without-selinux: |
| 8 | runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory |
| 9 | # include <selinux/flask.h> |
| 10 | ^ |
| 11 | compilation terminated. |
| 12 | |
| 13 | Upstream-Status: Pending |
| 14 | |
| 15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame^] | 16 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 17 | --- |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame^] | 18 | m4/gnulib-comp.m4 | 2 +- |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame^] | 22 | index dead90e..0abf0bd 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 23 | --- a/m4/gnulib-comp.m4 |
| 24 | +++ b/m4/gnulib-comp.m4 |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame^] | 25 | @@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT], |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 26 | AC_LIBOBJ([select]) |
| 27 | fi |
| 28 | gl_SYS_SELECT_MODULE_INDICATOR([select]) |
| 29 | - AC_CHECK_HEADERS([selinux/flask.h]) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 30 | gl_HEADERS_SELINUX_SELINUX_H |
| 31 | gl_HEADERS_SELINUX_CONTEXT_H |
| 32 | if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then |
| 33 | + AC_CHECK_HEADERS([selinux/flask.h]) |
| 34 | AC_LIBOBJ([getfilecon]) |
| 35 | fi |
| 36 | gl_SERVENT |