build: Re-arrange some configuration options

This commit is contained in:
Marcel Holtmann 2019-08-03 09:47:53 +02:00
parent 30821979f6
commit a8faa23de6
3 changed files with 24 additions and 19 deletions

20
README
View File

@ -127,17 +127,9 @@ that can be enabled if the functionality is required:
Since the public API of Embedded Linux library is not yet
stable, the usage of the internal ELL copy is preferred.
--enable-sim-hardcoded
Enable support for hard coded SIM keys
Note: With --disable-daemon this option is ignored
--enable-ofono
Enable support for oFono SIM authentication
Note: With --disable-daemon this option is ignored
--enable-wired
@ -172,6 +164,18 @@ that can be enabled if the functionality is required:
This enables building of all utilities that are however
not installed and only useful during development.
--enable-ofono
Enable support for oFono SIM authentication
Note: With --disable-daemon this option is ignored
--enable-sim-hardcoded
Enable support for hard coded SIM keys
Note: With --disable-daemon this option is ignored
--enable-docs
Enable generation of documentation and manual pages

View File

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

View File

@ -244,15 +244,6 @@ if (test "${enable_external_ell}" = "yes"); then
fi
AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes")
AC_ARG_ENABLE([sim_hardcoded], AC_HELP_STRING([--enable-sim-hardcoded],
[enable 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([wired], AC_HELP_STRING([--enable-wired],
[enable Ethernet authentication support]),
@ -269,6 +260,16 @@ AC_ARG_ENABLE([tools], AC_HELP_STRING([--enable-tools],
[enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "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([sim_hardcoded], AC_HELP_STRING([--enable-sim-hardcoded],
[enable hard coded SIM keys]),
[enable_sim_hardcoded=${enableval}])
AM_CONDITIONAL(SIM_HARDCODED, test "${enable_sim_hardcoded}" = "yes")
AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs],
[build documentation and manual pages]),
[enable_docs=${enableval}])