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 --git a/ChangeLog b/ChangeLog
index 1c6a7af..4de7e68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-21  Michael Haubenwallner <michael.haubenwallner@salomon.at>
+
+       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  <meyering@fb.com>
 
        regex: also remove dependency on HAVE_WCSCOLL

diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index 17cccff..eb005fc 100644 (file)
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -61,9 +61,11 @@ AC_DEFUN([gl_LIBSELINUX],
   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
 ])