summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-01-21 10:13:32 +0000
committerPádraig Brady <P@draigBrady.com>2014-01-21 11:03:34 +0000
commitbe97f3e0eff3b582ad35eb63e5edf0615019769f (patch)
tree6a690a24503281cd7bb5b752c6c48ca16a3737e9
parent9a115f3e246ae2dc070ccebf1891c8bfd7242083 (diff)
downloadcoreutils-be97f3e0eff3b582ad35eb63e5edf0615019769f.tar.xz
build: suppress an erroneous warning --with-selinux=no
* m4/jm-macros.m4: Don't check the SELinux cached variables --without-selinux. Reported-by: Bernhard Voelker
-rw-r--r--m4/jm-macros.m420
1 files changed, 11 insertions, 9 deletions
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index cb9e90ee2..a96ecabb6 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -51,15 +51,17 @@ AC_DEFUN([coreutils_MACROS],
# Used by install.c.
AC_CHECK_FUNCS([matchpathcon_init_prefix], [],
[
- case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
- no:*) # SELinux disabled
- ;;
- *:no) # SELinux disabled
- ;;
- *)
- AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
- AC_MSG_WARN([The install utility may run slowly])
- esac
+ if test "$with_selinux" != no; then
+ case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
+ no:*) # SELinux disabled
+ ;;
+ *:no) # SELinux disabled
+ ;;
+ *)
+ AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
+ AC_MSG_WARN([The install utility may run slowly])
+ esac
+ fi
])
LIBS=$coreutils_saved_libs