X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fselinux-context-h.m4;h=1e4bcfeeecfb41fcf797230e8df6a754423e82c5;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=234b4e55262c6104b3802f5428a7ec04ac92a4d6;hpb=8d8eda4eab3d2801251daf4eb31756c3595e2fc6;p=gnulib.git

diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4
index 234b4e552..1e4bcfeee 100644
--- a/m4/selinux-context-h.m4
+++ b/m4/selinux-context-h.m4
@@ -1,5 +1,5 @@
-# serial 1   -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
+# serial 3   -*- Autoconf -*-
+# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,8 +9,14 @@
 
 AC_DEFUN([gl_HEADERS_SELINUX_CONTEXT_H],
 [
-  AC_CHECK_HEADERS([selinux/context.h],
-                   [SELINUX_CONTEXT_H=],
-                   [SELINUX_CONTEXT_H=selinux/context.h])
+  AC_REQUIRE([gl_LIBSELINUX])
+  if test "$with_selinux" != no; then
+    AC_CHECK_HEADERS([selinux/context.h],
+                     [SELINUX_CONTEXT_H=],
+                     [SELINUX_CONTEXT_H=selinux/context.h])
+  else
+    SELINUX_CONTEXT_H=selinux/context.h
+  fi
   AC_SUBST([SELINUX_CONTEXT_H])
+  AM_CONDITIONAL([GL_GENERATE_SELINUX_CONTEXT_H], [test -n "$SELINUX_CONTEXT_H"])
 ])