diff options
Diffstat (limited to 'configure.in')
-rwxr-xr-x | configure.in | 96 |
1 files changed, 50 insertions, 46 deletions
diff --git a/configure.in b/configure.in index 69bc604a1..786d47cbc 100755 --- a/configure.in +++ b/configure.in @@ -190,7 +190,7 @@ ARG_ENABL_SET([addrblock], [enables RFC 3779 address block constraint suppo ARG_ENABL_SET([uci], [enable OpenWRT UCI configuration plugin.]) ARG_ENABL_SET([android], [enable Android specific plugin.]) ARG_ENABL_SET([maemo], [enable Maemo specific plugin.]) -ARG_ENABL_SET([nm], [enable NetworkManager plugin.]) +ARG_ENABL_SET([nm], [enable NetworkManager backend.]) ARG_ENABL_SET([ha], [enable high availability cluster plugin.]) ARG_ENABL_SET([whitelist], [enable peer identity whitelisting plugin.]) ARG_ENABL_SET([certexpire], [enable CSV export of expiration dates of used certificates.]) @@ -798,6 +798,7 @@ pki_plugins= scripts_plugins= manager_plugins= medsrv_plugins= +nm_plugins= # location specific lists for checksumming, # for src/libcharon, src/pluto, src/libhydra and src/libstrongswan @@ -807,60 +808,60 @@ h_plugins= s_plugins= ADD_PLUGIN([test-vectors], [s charon pluto openac scepclient pki]) -ADD_PLUGIN([curl], [s charon pluto scepclient scripts]) -ADD_PLUGIN([soup], [s charon pluto scripts]) -ADD_PLUGIN([ldap], [s charon pluto scepclient scripts]) +ADD_PLUGIN([curl], [s charon pluto scepclient scripts nm]) +ADD_PLUGIN([soup], [s charon pluto scripts nm]) +ADD_PLUGIN([ldap], [s charon pluto scepclient scripts nm]) ADD_PLUGIN([mysql], [s charon pluto pool manager medsrv attest]) ADD_PLUGIN([sqlite], [s charon pluto pool manager medsrv attest]) -ADD_PLUGIN([pkcs11], [s charon pki]) -ADD_PLUGIN([aes], [s charon pluto openac scepclient pki scripts]) -ADD_PLUGIN([des], [s charon pluto openac scepclient pki scripts]) -ADD_PLUGIN([blowfish], [s charon pluto openac scepclient pki scripts]) -ADD_PLUGIN([sha1], [s charon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([sha2], [s charon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([md4], [s charon openac manager scepclient pki]) -ADD_PLUGIN([md5], [s charon pluto openac scepclient pki scripts attest]) -ADD_PLUGIN([random], [s charon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([x509], [s charon pluto openac scepclient pki scripts attest]) -ADD_PLUGIN([revocation], [s charon]) -ADD_PLUGIN([constraints], [s charon]) +ADD_PLUGIN([pkcs11], [s charon pki nm]) +ADD_PLUGIN([aes], [s charon pluto openac scepclient pki scripts nm]) +ADD_PLUGIN([des], [s charon pluto openac scepclient pki scripts nm]) +ADD_PLUGIN([blowfish], [s charon pluto openac scepclient pki scripts nm]) +ADD_PLUGIN([sha1], [s charon pluto openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([sha2], [s charon pluto openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([md4], [s charon openac manager scepclient pki nm]) +ADD_PLUGIN([md5], [s charon pluto openac scepclient pki scripts attest nm]) +ADD_PLUGIN([random], [s charon pluto openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([x509], [s charon pluto openac scepclient pki scripts attest nm]) +ADD_PLUGIN([revocation], [s charon nm]) +ADD_PLUGIN([constraints], [s charon nm]) ADD_PLUGIN([pubkey], [s charon]) -ADD_PLUGIN([pkcs1], [s charon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([pkcs8], [s charon pluto openac scepclient pki scripts manager medsrv attest]) +ADD_PLUGIN([pkcs1], [s charon pluto openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([pkcs8], [s charon pluto openac scepclient pki scripts manager medsrv attest nm]) ADD_PLUGIN([pgp], [s charon pluto]) ADD_PLUGIN([dnskey], [s pluto]) -ADD_PLUGIN([pem], [s charon pluto openac scepclient pki scripts manager medsrv attest]) +ADD_PLUGIN([pem], [s charon pluto openac scepclient pki scripts manager medsrv attest nm]) ADD_PLUGIN([padlock], [s charon]) -ADD_PLUGIN([openssl], [s charon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([gcrypt], [s charon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([af-alg], [s charon pluto openac scepclient pki scripts medsrv attest]) -ADD_PLUGIN([fips-prf], [s charon]) -ADD_PLUGIN([gmp], [s charon pluto openac scepclient pki scripts manager medsrv attest]) -ADD_PLUGIN([agent], [s charon]) -ADD_PLUGIN([xcbc], [s charon]) -ADD_PLUGIN([cmac], [s charon]) -ADD_PLUGIN([hmac], [s charon pluto scripts]) -ADD_PLUGIN([ctr], [s charon scripts]) -ADD_PLUGIN([ccm], [s charon scripts]) -ADD_PLUGIN([gcm], [s charon scripts]) +ADD_PLUGIN([openssl], [s charon pluto openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([gcrypt], [s charon pluto openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([af-alg], [s charon pluto openac scepclient pki scripts medsrv attest nm]) +ADD_PLUGIN([fips-prf], [s charon nm]) +ADD_PLUGIN([gmp], [s charon pluto openac scepclient pki scripts manager medsrv attest nm]) +ADD_PLUGIN([agent], [s charon nm]) +ADD_PLUGIN([xcbc], [s charon nm]) +ADD_PLUGIN([cmac], [s charon nm]) +ADD_PLUGIN([hmac], [s charon pluto scripts nm]) +ADD_PLUGIN([ctr], [s charon scripts nm]) +ADD_PLUGIN([ccm], [s charon scripts nm]) +ADD_PLUGIN([gcm], [s charon scripts nm]) ADD_PLUGIN([xauth], [p pluto]) ADD_PLUGIN([attr], [h charon pluto]) ADD_PLUGIN([attr-sql], [h charon pluto]) ADD_PLUGIN([load-tester], [c charon]) -ADD_PLUGIN([kernel-pfkey], [h charon pluto starter]) -ADD_PLUGIN([kernel-pfroute], [h charon pluto starter]) +ADD_PLUGIN([kernel-pfkey], [h charon pluto starter nm]) +ADD_PLUGIN([kernel-pfroute], [h charon pluto starter nm]) ADD_PLUGIN([kernel-klips], [h charon pluto starter]) -ADD_PLUGIN([kernel-netlink], [h charon pluto starter]) +ADD_PLUGIN([kernel-netlink], [h charon pluto starter nm]) ADD_PLUGIN([resolve], [h charon pluto]) -ADD_PLUGIN([socket-default], [c charon]) -ADD_PLUGIN([socket-raw], [c charon]) +ADD_PLUGIN([socket-default], [c charon nm]) +ADD_PLUGIN([socket-raw], [c charon nm]) ADD_PLUGIN([socket-dynamic], [c charon]) ADD_PLUGIN([farp], [c charon]) ADD_PLUGIN([stroke], [c charon]) ADD_PLUGIN([smp], [c charon]) ADD_PLUGIN([sql], [c charon]) ADD_PLUGIN([updown], [c charon]) -ADD_PLUGIN([eap-identity], [c charon]) +ADD_PLUGIN([eap-identity], [c charon nm]) ADD_PLUGIN([eap-sim], [c charon]) ADD_PLUGIN([eap-sim-file], [c charon]) ADD_PLUGIN([eap-sim-pcsc], [c charon]) @@ -869,13 +870,13 @@ ADD_PLUGIN([eap-aka-3gpp2], [c charon]) ADD_PLUGIN([eap-simaka-sql], [c charon]) ADD_PLUGIN([eap-simaka-pseudonym], [c charon]) ADD_PLUGIN([eap-simaka-reauth], [c charon]) -ADD_PLUGIN([eap-md5], [c charon]) -ADD_PLUGIN([eap-gtc], [c charon]) -ADD_PLUGIN([eap-mschapv2], [c charon]) +ADD_PLUGIN([eap-md5], [c charon nm]) +ADD_PLUGIN([eap-gtc], [c charon nm]) +ADD_PLUGIN([eap-mschapv2], [c charon nm]) ADD_PLUGIN([eap-radius], [c charon]) -ADD_PLUGIN([eap-tls], [c charon]) -ADD_PLUGIN([eap-ttls], [c charon]) -ADD_PLUGIN([eap-peap], [c charon]) +ADD_PLUGIN([eap-tls], [c charon nm]) +ADD_PLUGIN([eap-ttls], [c charon nm]) +ADD_PLUGIN([eap-peap], [c charon nm]) ADD_PLUGIN([eap-tnc], [c charon]) ADD_PLUGIN([xauth-generic], [c charon]) ADD_PLUGIN([xauth-eap], [c charon]) @@ -915,6 +916,7 @@ AC_SUBST(pki_plugins) AC_SUBST(scripts_plugins) AC_SUBST(manager_plugins) AC_SUBST(medsrv_plugins) +AC_SUBST(nm_plugins) AC_SUBST(c_plugins) AC_SUBST(p_plugins) @@ -1061,12 +1063,13 @@ AM_CONDITIONAL(USE_IKEV2, test x$ikev2 = xtrue) AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue) AM_CONDITIONAL(USE_ADNS, test x$adns = xtrue) AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue) +AM_CONDITIONAL(USE_NM, test x$nm = xtrue) AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue) AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue) AM_CONDITIONAL(USE_CONFTEST, test x$conftest = xtrue) -AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue) -AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$pluto = xtrue) -AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue) +AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue) +AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$pluto = xtrue -o x$nm = xtrue) +AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue) AM_CONDITIONAL(USE_LIBTNCIF, test x$tnc_tnccs = xtrue -o x$imcv = xtrue) AM_CONDITIONAL(USE_LIBTNCCS, test x$tnc_tnccs = xtrue) AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue) @@ -1175,6 +1178,7 @@ AC_OUTPUT( src/pluto/plugins/xauth/Makefile src/whack/Makefile src/charon/Makefile + src/charon-nm/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile |