| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 |
| 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> |
| 16 | --- |
| 17 | m4/gnulib-comp.m4 | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 |
| 21 | index 472d3a0..5f09734 100644 |
| 22 | --- a/m4/gnulib-comp.m4 |
| 23 | +++ b/m4/gnulib-comp.m4 |
| 24 | @@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT], |
| 25 | AC_LIBOBJ([select]) |
| 26 | fi |
| 27 | gl_SYS_SELECT_MODULE_INDICATOR([select]) |
| 28 | - AC_CHECK_HEADERS([selinux/flask.h]) |
| 29 | AC_LIBOBJ([selinux-at]) |
| 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 |
| 37 | -- |
| 38 | 1.7.9.5 |
| 39 | |