From 7531b175c991c5f6c904a3a65a92deadf8f60fe0 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 14 Sep 2018 13:29:58 +0200
Subject: [PATCH] build: Fix plugin enabling for oFono and hard coded SIM

---
 bootstrap-configure |  2 ++
 configure.ac        | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bootstrap-configure b/bootstrap-configure
index 0025a0fa..fe6bb0bf 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -9,5 +9,7 @@ fi
 		--enable-debug \
 		--prefix=/usr \
 		--localstatedir=/var \
+		--enable-ofono \
+		--enable-sim-hardcoded \
 		--disable-dbus-policy \
 		--disable-systemd-service $*
diff --git a/configure.ac b/configure.ac
index 4cb0d96c..bbf18cfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,18 +53,6 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
 	fi
 ])
 
-
-AC_ARG_ENABLE(sim_hardcoded, AC_HELP_STRING([--disable-sim-hardcoded],
-			[disable hard coded SIM keys]),
-			[enable_sim_hardcoded=${enableval}])
-AM_CONDITIONAL(SIM_HARDCODED, test "${enable_sim_hardcoded}" != "no")
-
-AC_ARG_ENABLE(ofono, AC_HELP_STRING([--disable-ofono],
-			[disable ofono support]),
-			[echo "CHECKING"
-			enable_ofono=${enableval}])
-AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
-
 if (test "${prefix}" = "NONE"); then
 	dnl no prefix and no localstatedir, so default to /var
 	if (test "$localstatedir" = '${prefix}/var'); then
@@ -156,6 +144,16 @@ if (test "${enable_dbus_policy}" != "no" && test -z "${path_dbus_datadir}"); the
 fi
 AC_SUBST(DBUS_DATADIR, [${path_dbus_datadir}])
 
+AC_ARG_ENABLE(sim_hardcoded, AC_HELP_STRING([--enable-sim-hardcoded],
+				[enabled hard coded SIM keys]),
+					[enable_sim_hardcoded=${enableval}])
+AM_CONDITIONAL(SIM_HARDCODED, test "${enable_sim_hardcoded}" = "yes")
+
+AC_ARG_ENABLE(ofono, AC_HELP_STRING([--enable-ofono],
+				[enable oFono SIM authentication support]),
+					[enable_ofono=${enableval}])
+AM_CONDITIONAL(OFONO, test "${enable_ofono}" = "yes")
+
 AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs],
 				[build documentation and manual pages]),
 					[enable_docs=${enableval}])