Re: [PATCH] Really build without selinux when library is missing.

[Pádraig Brady]

On 10/21/2013 02:41 PM, Michael Haubenwallner wrote:
> * 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.
> ---
>  ChangeLog               | 6 ++++++
>  m4/selinux-selinux-h.m4 | 1 +
>  2 files changed, 7 insertions(+)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 1855d16..de9226d 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,9 @@
> +2013-10-21  Michael Haubenwallner <address@hidden>
> +
> +     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-20  Jim Meyering  <address@hidden>
>  
>       error: add the printf attribute to a static function
> diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
> index 17cccff..86be161 100644
> --- a/m4/selinux-selinux-h.m4
> +++ b/m4/selinux-selinux-h.m4
> @@ -65,5 +65,6 @@ AC_DEFUN([gl_LIBSELINUX],
>       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.])
> +    with_selinux=no
>    fi
>  ])
> 

That would still be dependent on /selinux being present
for the right thing to be done.
Does this more general fix work for you?

diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index 17cccff..eb005fc 100644
--- 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
 ])