diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-04-21 21:40:20 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-04-21 21:40:20 +0200 |
| commit | a4ad2953a48dd276a3b16765cb4bb38b30d9a48d (patch) | |
| tree | 64d6efa4694e779b8582e55ed2720f0da4756745 /configure.ac | |
| parent | f8c56dea65539bc495d75216fd370bc2ac3cf5b1 (diff) | |
| download | connman-a4ad2953a48dd276a3b16765cb4bb38b30d9a48d.tar.gz connman-a4ad2953a48dd276a3b16765cb4bb38b30d9a48d.tar.bz2 connman-a4ad2953a48dd276a3b16765cb4bb38b30d9a48d.zip | |
build: Allow NM and PolicyKit plugins only as builtins
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 8c3a1b79..8ab72589 100644 --- a/configure.ac +++ b/configure.ac @@ -246,12 +246,6 @@ AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm], [enable Intel OSPM support]), [enable_iospm=${enableval}]) AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes") -AC_ARG_ENABLE(nmcompat, - AC_HELP_STRING([--enable-nmcompat], [enable nmcompat support]), - [enable_nmcompat=${enableval}], [enable_nmcompat="no"]) -AM_CONDITIONAL(NMCOMPAT, test "${enable_nmcompat}" != "no") -AM_CONDITIONAL(NMCOMPAT_BUILTIN, test "${enable_nmcompat}" = "builtin") - AC_ARG_ENABLE(tist, AC_HELP_STRING([--enable-tist], [enable TI Shared Transport support]), [enable_tist=${enableval}], [enable_tist="no"]) @@ -321,20 +315,6 @@ PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes, AC_SUBST(XTABLES_CFLAGS) AC_SUBST(XTABLES_LIBS) -AC_ARG_ENABLE(polkit, - AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]), - [enable_polkit=${enableval}], [enable_polkit="no"]) -if (test "${enable_polkit}" != "no"); then - POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`" - POLKIT_DATADIR="" - if (test -z "${POLKIT_DATADIR}"); then - POLKIT_DATADIR="${datadir}/polkit-1/actions" - fi - AC_SUBST(POLKIT_DATADIR) -fi -AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no") -AM_CONDITIONAL(POLKIT_BUILTIN, test "${enable_polkit}" = "builtin") - AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable command line client]), [enable_client=${enableval}]) AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes") @@ -366,6 +346,24 @@ if (test "${enable_capng}" = "yes"); then AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) fi +AC_ARG_ENABLE(nmcompat, AC_HELP_STRING([--enable-nmcompat], + [enable Network Manager support]), + [enable_nmcompat=${enableval}], [enable_nmcompat="no"]) +AM_CONDITIONAL(NMCOMPAT, test "${enable_nmcompat}" != "no") + +AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit], + [enable PolicyKit support]), + [enable_polkit=${enableval}], [enable_polkit="no"]) +if (test "${enable_polkit}" != "no"); then + POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`" + POLKIT_DATADIR="" + if (test -z "${POLKIT_DATADIR}"); then + POLKIT_DATADIR="${datadir}/polkit-1/actions" + fi + AC_SUBST(POLKIT_DATADIR) +fi +AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no") + AC_ARG_ENABLE(loopback, AC_HELP_STRING([--disable-loopback], [disable loopback support]), [enable_loopback=${enableval}]) |