build: Fix plugin enabling for oFono and hard coded SIM

bootstrap-configure

@@ -9,5 +9,7 @@ fi
 		--enable-debug \
 		--prefix=/usr \
 		--localstatedir=/var \
+		--enable-ofono \
+		--enable-sim-hardcoded \
 		--disable-dbus-policy \
 		--disable-systemd-service $*

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}])