From db774a54a68af54771d2c45376934a4134cb1260 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 30 Sep 2010 14:53:44 -0400
Subject: [PATCH] Add support for custom build options.

---
 Changelog  | 1 +
 Makefile   | 4 ++++
 build.conf | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/Changelog b/Changelog
index 72baf6d23..385eeee19 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Add support for custom build options.
 - Unconditional staff and user oidentd home config access from Dominick Grift.
 - Conditional mmap_zero support from Dominick Grift.
 - Added devtmpfs support.
diff --git a/Makefile b/Makefile
index f802d3bd0..376acee69 100644
--- a/Makefile
+++ b/Makefile
@@ -196,6 +196,10 @@ ifneq ($(OUTPUT_POLICY),)
 	CHECKPOLICY += -c $(OUTPUT_POLICY)
 endif
 
+ifneq "$(CUSTOM_BUILDOPT)" ""
+	M4PARAM += $(foreach opt,$(CUSTOM_BUILDOPT),-D $(opt))
+endif
+
 # if not set, use the type as the name.
 NAME ?= $(TYPE)
 
diff --git a/build.conf b/build.conf
index 4aae82deb..d13e23628 100644
--- a/build.conf
+++ b/build.conf
@@ -52,6 +52,12 @@ MONOLITHIC = y
 # Enable UBAC for role separations.
 UBAC = y
 
+# Custom build options.  This field enables custom
+# build options.  Putting foo here will enable
+# build option blocks named foo.  Options should be
+# separated by spaces.
+CUSTOM_BUILDOPT =
+
 # Number of MLS Sensitivities
 # The sensitivities will be s0 to s(MLS_SENS-1).
 # Dominance will be in increasing numerical order