X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fselinux-context-h.m4;h=54a388db75e604a8cc2314b372df5454f0c89c7b;hb=372ef2a0e94ec6ee85b5fc4bab763154ec11420d;hp=6b0bed16ae61f0e368b02c8ab700dd6e7cdb3086;hpb=bfee83b134136d03de06c20972a18c5f59bef482;p=gnulib.git

diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4
index 6b0bed16a..54a388db7 100644
--- a/m4/selinux-context-h.m4
+++ b/m4/selinux-context-h.m4
@@ -1,5 +1,5 @@
-# serial 1   -*- Autoconf -*-
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# serial 3   -*- Autoconf -*-
+# Copyright (C) 2006-2007, 2009-2011 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"])
 ])