diff options
| author | Kamil Dudka <kdudka@redhat.com> | 2009-08-04 16:21:08 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-08-04 16:51:52 +0200 |
| commit | 1762092901adf040445d59931d14837ef7f2ebe1 (patch) | |
| tree | 5eaf71b990598379906d816c081a93346b02ff05 | |
| parent | c60f151ebdfd47a56991a1fb481b28a2020d27f5 (diff) | |
| download | coreutils-1762092901adf040445d59931d14837ef7f2ebe1.tar.xz | |
install runs faster again with SELinux enabled
* m4/jm-macros.m4: Pull in SELinux libraries while checking for
matchpathcon_init_prefix (). Emit configure warning when not found
with SELinux enabled.
* NEWS (Bug fixes): Mention it.
The bug was introduced in coreutils-7.0 via commit 0647f3eb, 2008-06-02,
"accommodate older SELinux which lacks matchpathcon_init_prefix".
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | m4/jm-macros.m4 | 16 |
2 files changed, 18 insertions, 1 deletions
@@ -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]) |