diff --git a/NEWS b/NEWS index 80c60e2ef..5058b5783 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ GNU coreutils NEWS -*- outline -*- ** Bug fixes + install runs faster again with SELinux enabled + [introduced in coreutils-7.0] + ls -1U (with two or more arguments, at least one a nonempty directory) would print entry names *before* the name of the containing directory. Also fixed incorrect output of ls -1RU and ls -1sU. diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index f14d6a382..f862984cc 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -47,7 +47,21 @@ AC_DEFUN([coreutils_MACROS], AC_CHECK_FUNCS_ONCE([directio]) # Used by install.c. - AC_CHECK_FUNCS_ONCE([matchpathcon_init_prefix]) + coreutils_saved_libs=$LIBS + LIBS="$LIBS $LIB_SELINUX" + 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 + ]) + LIBS=$coreutils_saved_libs # Used by sort.c. AC_CHECK_FUNCS_ONCE([nl_langinfo])