X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=74d5113b93e53365a76c0d6882b181c9ec0ffd64;hb=298c69510ff4b64a262d465eb8877c4e7f4e60e0;hp=37e1bb2f6260c32998e7fb955bca78f4806ef1eb;hpb=371ca50a74a9c4f1b74c4c1b65c6fdec610fcfc3;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index 37e1bb2f626..74d5113b93e 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -211,6 +211,7 @@ AC_SUBST(AR_FLAGS)
 
 # Please keep alphabetical order
 PLUGIN_ENABLED(acl)
+PLUGIN_ENABLED(cdp)
 PLUGIN_ENABLED(dpdk)
 PLUGIN_ENABLED(flowprobe)
 PLUGIN_ENABLED(gbp)
@@ -225,15 +226,16 @@ PLUGIN_ENABLED(marvell)
 PLUGIN_ENABLED(memif)
 PLUGIN_ENABLED(pppoe)
 PLUGIN_ENABLED(nat)
-PLUGIN_ENABLED(sixrd)
 PLUGIN_ENABLED(srv6ad)
 PLUGIN_ENABLED(srv6am)
 PLUGIN_ENABLED(srv6as)
 PLUGIN_ENABLED(stn)
+PLUGIN_ENABLED(tlsmbedtls)
 
 ###############################################################################
 # Dependency checks
 ###############################################################################
+AC_CHECK_FUNC([memfd_create], [AC_DEFINE([HAVE_MEMFD_CREATE], [1], [Define if memfd exists])])
 
 AM_COND_IF([ENABLE_DPDK_SHARED],
 [
@@ -271,28 +273,6 @@ AM_CONDITIONAL(WITH_AESNI_MB_LIB, test "$with_aesni_mb_lib" = "yes")
 m4_append([list_of_with], [isa_l_crypto_lib], [, ])
 AM_CONDITIONAL(WITH_ISA_L_CRYPTO_LIB, test "$with_isa_l_crypto_lib" = "yes")
 
-
-with_ibverbs_lib=no
-DPDK_IS_PMD_ENABLED(LIBRTE_MLX4_PMD, dpdk_mlx4_pmd)
-AM_COND_IF([WITH_DPDK_MLX4_PMD],
-[
-  AC_CHECK_LIB([ibverbs], [ibv_fork_init],
-	       [with_ibverbs_lib=yes],
-	       [AC_MSG_ERROR([ibverbs library not found])])
-])
-
-DPDK_IS_PMD_ENABLED(LIBRTE_MLX5_PMD, dpdk_mlx5_pmd)
-AM_COND_IF([WITH_DPDK_MLX5_PMD],
-[
-  AC_CHECK_LIB([ibverbs], [ibv_fork_init],
-	       [with_ibverbs_lib=yes],
-	       [AC_MSG_ERROR([ibverbs library not found])])
-])
-
-m4_append([list_of_with], [ibverbs_lib], [, ])
-AM_CONDITIONAL(WITH_IBVERBS_LIB, test "$with_ibverbs_lib" = "yes")
-
-
 AM_COND_IF([ENABLE_G2],
 [
   PKG_CHECK_MODULES(g2, gtk+-2.0)
@@ -309,19 +289,23 @@ AM_COND_IF([ENABLE_MARVELL_PLUGIN],
     ])
 ])
 
-AM_COND_IF([WITH_MBEDTLS],
+AM_COND_IF([WITH_MBEDTLS], [],
+[
+  AC_MSG_WARN([mbedtls not enabled. Disabling tlsmbedtls plugin])
+  enable_tlsmbedtls_plugin=no
+  AM_CONDITIONAL(ENABLE_TLSMBEDTLS_PLUGIN, false)
+])
+
+AM_COND_IF([ENABLE_TLSMBEDTLS_PLUGIN],
 [
   AC_CHECK_HEADERS([mbedtls/ssl.h], [],
     [
-      AC_MSG_WARN([mbedtls headers not found. TLS app disabled])
-      AM_CONDITIONAL(WITH_MBEDTLS, false)
+      AC_MSG_WARN([mbedtls headers not found. TLS engine implementation disabled])
+      enable_tlsmbedtls_plugin=no
+      AM_CONDITIONAL(ENABLE_TLSMBEDTLS_PLUGIN, false)
     ], [])
 ])
 
-AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
-if test "$VPPAPIGEN" = "no"; then
-   VPPAPIGEN=\$\(top_srcdir\)/tools/vppapigen/vppapigen
-fi
 
 ###############################################################################
 # JAVA