From 8da33905f4cd22e72c6b08cbfdbd31fb907922aa Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 14 Sep 2018 13:46:55 +0200
Subject: [PATCH] build: Add configuration for building internal utilities

---
 Makefile.am         | 3 +++
 bootstrap-configure | 1 +
 configure.ac        | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 0bcd3721..548934cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,6 +179,7 @@ monitor_iwmon_SOURCES = monitor/main.c linux/nl80211.h \
 monitor_iwmon_LDADD = ell/libell-internal.la
 endif
 
+if TOOLS
 noinst_PROGRAMS += tools/hwsim
 
 tools_hwsim_SOURCES = tools/hwsim.c src/mpdu.h \
@@ -186,7 +187,9 @@ tools_hwsim_SOURCES = tools/hwsim.c src/mpdu.h \
 					src/storage.h src/storage.c \
 					src/common.h src/common.c
 tools_hwsim_LDADD = ell/libell-internal.la
+endif
 
+if TOOLS
 noinst_PROGRAMS += tools/test-runner
 
 tools_test_runner_SOURCES = tools/test-runner.c
diff --git a/bootstrap-configure b/bootstrap-configure
index 23bb7d79..bbc28dc2 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -11,5 +11,6 @@ fi
 		--localstatedir=/var \
 		--enable-sim-hardcoded \
 		--enable-ofono \
+		--enable-tools \
 		--disable-dbus-policy \
 		--disable-systemd-service $*
diff --git a/configure.ac b/configure.ac
index bbf18cfd..fe4ac171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,6 +154,11 @@ AC_ARG_ENABLE(ofono, AC_HELP_STRING([--enable-ofono],
 					[enable_ofono=${enableval}])
 AM_CONDITIONAL(OFONO, test "${enable_ofono}" = "yes")
 
+AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
+				[enable internal testing utilities]),
+					[enable_tools=${enableval}])
+AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
+
 AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs],
 				[build documentation and manual pages]),
 					[enable_docs=${enableval}])