From cca4cf3e62abedf910d468775cba921ca668ff8e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 1 Mar 2014 15:10:39 -0500 Subject: [PATCH] build: Add --enable-selinux-custom-policy Don't use this. It's just for me, and only temporarily until this stuff all lands in the Fedora (and ideally upstream) selinux-policy. --- Makefile.am | 2 +- configure.ac | 6 ++++++ selinux/Makefile.am | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 803ce0aa..719dbd01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ endif SUBDIRS += . -if USE_SELINUX +if BUILD_SELINUX_CUSTOM_POLICY SUBDIRS += selinux endif diff --git a/configure.ac b/configure.ac index bbd9cbf6..02b03694 100644 --- a/configure.ac +++ b/configure.ac @@ -164,6 +164,12 @@ AS_IF([ test x$with_selinux != xno ], [ if test x$with_selinux != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +selinux"; fi AM_CONDITIONAL(USE_SELINUX, test $with_selinux != no) +dnl FIXME remove this +AC_ARG_ENABLE(selinux-custom-policy, + AS_HELP_STRING([--enable-selinux-custom-policy], [Custom policy overrides]),, + enable_selinux_custom_policy=no) +AM_CONDITIONAL(BUILD_SELINUX_CUSTOM_POLICY, test x$enable_selinux_custom_policy = xyes) + AC_ARG_WITH(dracut, AS_HELP_STRING([--with-dracut], [Install dracut module (default: no)]),, diff --git a/selinux/Makefile.am b/selinux/Makefile.am index 1d69949f..498f9df8 100644 --- a/selinux/Makefile.am +++ b/selinux/Makefile.am @@ -20,3 +20,5 @@ ostree.pp: ostree.fc ostree.if ostree.te selinuxpkgdir = $(datadir)/selinux/packages selinuxpkg_DATA = ostree.pp + +EXTRA_DIST = ostree.fc ostree.if ostree.te