Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15088:809af8ef1bf3
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 21 May 2011 22:38:03 +0200 |
| parents | b4000fa9527e |
| children | 9a04eac49081 |
| files | ChangeLog m4/selinux-selinux-h.m4 modules/selinux-h |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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. * m4/select.m4 (gl_FUNC_SELECT): Move AC_LIBOBJ invocations from here...
--- 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 @@ 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.])
--- a/modules/selinux-h +++ b/modules/selinux-h @@ -16,6 +16,9 @@ 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