3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-24 16:49:25 +01:00

build: Fix plugin enabling for oFono and hard coded SIM

This commit is contained in:
Marcel Holtmann 2018-09-14 13:29:58 +02:00
parent 2cb8a59fd9
commit 7531b175c9
2 changed files with 12 additions and 12 deletions

View File

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

View File

@ -53,18 +53,6 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
fi 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 if (test "${prefix}" = "NONE"); then
dnl no prefix and no localstatedir, so default to /var dnl no prefix and no localstatedir, so default to /var
if (test "$localstatedir" = '${prefix}/var'); then if (test "$localstatedir" = '${prefix}/var'); then
@ -156,6 +144,16 @@ if (test "${enable_dbus_policy}" != "no" && test -z "${path_dbus_datadir}"); the
fi fi
AC_SUBST(DBUS_DATADIR, [${path_dbus_datadir}]) 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], AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs],
[build documentation and manual pages]), [build documentation and manual pages]),
[enable_docs=${enableval}]) [enable_docs=${enableval}])