diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.plugins | 14 | ||||
| -rwxr-xr-x | bootstrap-configure | 4 | ||||
| -rw-r--r-- | configure.ac | 38 |
4 files changed, 22 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index f9663fff..f47c2f87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -239,6 +239,8 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --disable-datafiles \ --enable-hh2serial-gps \ --enable-openconnect \ + --enable-nmcompat \ + --enable-polkit \ --enable-client \ --enable-tools diff --git a/Makefile.plugins b/Makefile.plugins index f59c213d..9018d314 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -157,15 +157,8 @@ builtin_sources += plugins/pacrunner.c endif if POLKIT -if POLKIT_BUILTIN builtin_modules += polkit builtin_sources += plugins/polkit.c -else -plugin_LTLIBRARIES += plugins/polkit.la -plugin_objects += $(plugins_polkit_la_OBJECTS) -plugins_polkit_la_CFLAGS = $(plugin_cflags) -plugins_polkit_la_LDFLAGS = $(plugin_ldflags) -endif if DATAFILES policydir = @POLKIT_DATADIR@ @@ -209,15 +202,8 @@ scripts_openvpn_script_LDADD = @DBUS_LIBS@ endif if NMCOMPAT -if NMCOMPAT_BUILTIN builtin_modules += nmcompat builtin_sources += plugins/nmcompat.c -else -plugin_LTLIBRARIES += plugins/nmcompat.la -plugin_objects += $(plugins_nmcompat_la_OBJECTS) -plugins_nmcompat_la_CFLAGS = $(plugin_cflags) -plugins_nmcompat_la_LDFLAGS = $(plugin_ldflags) -endif endif if TIST diff --git a/bootstrap-configure b/bootstrap-configure index 59a64e59..a0e6d291 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -18,8 +18,8 @@ fi --disable-datafiles \ --enable-openconnect=builtin \ --enable-openvpn=builtin \ - --enable-nmcompat=builtin \ - --enable-polkit=builtin \ + --enable-nmcompat \ + --enable-polkit \ --enable-capng \ --enable-client \ --enable-tools $* 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}]) |