From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 20:38:03 +0000 (+0200)
Subject: selinux-h: Move AC_LIBOBJ invocations to module description.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78d7019b3d120e25182983e78dea23e7b9fbc47b;p=pspp

selinux-h: Move AC_LIBOBJ invocations to module description.

* m4/selinux-selinux-h.m4 (gl_HEADERS_SELINUX_SELINUX_H): Move
AC_LIBOBJ invocation from here...
* modules/selinux-h (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 7654589f78..8820ea4810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	selinux-h: Move AC_LIBOBJ invocations to module description.
+	* m4/selinux-selinux-h.m4 (gl_HEADERS_SELINUX_SELINUX_H): Move
+	AC_LIBOBJ invocation from here...
+	* modules/selinux-h (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	select: Respect rules for use of AC_LIBOBJ.
diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index 7afd416cdd..ee32370963 100644
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -1,4 +1,4 @@
-# serial 4   -*- Autoconf -*-
+# serial 5   -*- 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,
@@ -18,7 +18,6 @@ AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H],
     if test "$ac_cv_header_selinux_selinux_h" = yes; then
       # We do have <selinux/selinux.h>, so do compile getfilecon.c
       # and arrange to use its wrappers.
-      AC_LIBOBJ([getfilecon])
       gl_CHECK_NEXT_HEADERS([selinux/selinux.h])
       AC_DEFINE([getfilecon], [rpl_getfilecon],
                 [Always use our getfilecon wrapper.])
diff --git a/modules/selinux-h b/modules/selinux-h
index 5cdc91a6a4..840106c107 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -16,6 +16,9 @@ configure.ac:
 gl_HEADERS_SELINUX_SELINUX_H
 gl_HEADERS_SELINUX_CONTEXT_H
 AC_REQUIRE([AC_C_INLINE])
+if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
+  AC_LIBOBJ([getfilecon])
+fi
 
 Makefile.am:
 lib_SOURCES += se-context.in.h se-selinux.in.h