# HG changeset patch # User Michael Haubenwallner # Date 1382384355 -3600 # Node ID e6179db748035ee033dbaf78071985fefce7da39 # Parent 35f4d54fdc3abfde112adcc6907e2f5464f06c7d selinux-h: really build without selinux when library is missing * m4/selinux-selinux-h.m4: When the selinux library is missing, really continue without selinux, as already told in the warning message. This is necessary for when the 64bit selinux development package is installed only, but the package (tar-1.27 fex) is built as 32bit, causing the header files to be found while the library already wasn't found earlier. diff -r 35f4d54fdc3a -r e6179db74803 ChangeLog --- a/ChangeLog Mon Oct 21 14:54:30 2013 -0700 +++ b/ChangeLog Mon Oct 21 20:39:15 2013 +0100 @@ -1,3 +1,9 @@ +2013-10-21 Michael Haubenwallner + + selinux-h: Really build without selinux when library is missing. + * m4/selinux-selinux-h.m4: When the selinux library is missing, really + continue without selinux, as already told in the warning message. + 2013-10-21 Jim Meyering regex: also remove dependency on HAVE_WCSCOLL diff -r 35f4d54fdc3a -r e6179db74803 m4/selinux-selinux-h.m4 --- a/m4/selinux-selinux-h.m4 Mon Oct 21 14:54:30 2013 -0700 +++ b/m4/selinux-selinux-h.m4 Mon Oct 21 20:39:15 2013 +0100 @@ -61,9 +61,11 @@ AC_SUBST([LIB_SELINUX]) # Warn if SELinux is found but libselinux is absent; - if test "$ac_cv_search_setfilecon" = no && - test "$host" = "$build" && test -d /selinux; then - AC_MSG_WARN([This system supports SELinux but libselinux is missing.]) - AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.]) + if test "$ac_cv_search_setfilecon" = no; then + if test "$host" = "$build" && test -d /selinux; then + AC_MSG_WARN([This system supports SELinux but libselinux is missing.]) + AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.]) + fi + with_selinux=no fi ])