-AC_INIT([vpp], [18.01], [vpp-dev@fd.io])
+AC_INIT([vpp], [18.04], [vpp-dev@fd.io])
LT_INIT
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([subdir-objects])
m4_append_uniq([list_of_with], [$2], [, ])
])
-AC_DEFUN([DETECT_DPDK_IS_1702_OR_1705],
-[
- AC_MSG_CHECKING([for RTE_VERSION 17.02/17.05 in rte_version.h])
- AC_TRY_RUN(
- [
- #include <rte_version.h>
- int main()
- {
- return ((RTE_VER_YEAR != 17) ||
- (RTE_VER_MONTH != 2 && RTE_VER_MONTH != 5));
- }
- ],
- [dpdk_is_1702_or_1705=yes]
- [AC_MSG_RESULT([yes])],
- [dpdk_is_1702_or_1705=no]
- [AC_MSG_RESULT([no])]
- )
- AM_CONDITIONAL(DPDK_IS_1702_OR_1705, test "$dpdk_is_1702_or_1705" = "yes")
-])
-
# Check if compiler supports specific flag
AC_DEFUN([CC_CHECK_FLAG],
[
ac_saved_cflags="$CFLAGS"
CFLAGS="-Werror $1"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
- [c_flag_check=yes],
- [c_flag_check=no]
+ [cc_flag_check=yes],
+ [cc_flag_check=no]
)
- AC_MSG_RESULT([$c_flag_check])
+ AC_MSG_RESULT([$cc_flag_check])
CFLAGS="$ac_saved_cflags"
AC_LANG_POP([C])
])
# --without-X
WITHOUT_ARG(libssl, [Disable libssl])
WITHOUT_ARG(apicli, [Disable binary api CLI])
+WITHOUT_ARG(mbedtls, [Disable mbedtls])
AC_ARG_WITH(unix,
AC_HELP_STRING([--with-unix],[Compile unix version of clib]),
AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB, [${n_enable_dpdk_shared}])
AC_DEFINE_UNQUOTED(WITH_LIBSSL, [${n_with_libssl}])
+AC_DEFINE_UNQUOTED(WITH_MBEDTLS, [${n_with_mbedtls}])
# Silence following noise:
# Please keep alphabetical order
PLUGIN_ENABLED(acl)
+PLUGIN_ENABLED(cdp)
PLUGIN_ENABLED(dpdk)
PLUGIN_ENABLED(flowprobe)
+PLUGIN_ENABLED(gbp)
PLUGIN_ENABLED(gtpu)
+PLUGIN_ENABLED(igmp)
PLUGIN_ENABLED(ila)
PLUGIN_ENABLED(ioam)
PLUGIN_ENABLED(ixge)
+PLUGIN_ENABLED(kubeproxy)
+PLUGIN_ENABLED(l2e)
PLUGIN_ENABLED(lb)
+PLUGIN_ENABLED(marvell)
PLUGIN_ENABLED(memif)
PLUGIN_ENABLED(pppoe)
-PLUGIN_ENABLED(sixrd)
PLUGIN_ENABLED(nat)
+PLUGIN_ENABLED(srv6ad)
+PLUGIN_ENABLED(srv6am)
+PLUGIN_ENABLED(srv6as)
PLUGIN_ENABLED(stn)
+PLUGIN_ENABLED(tlsmbedtls)
+PLUGIN_ENABLED(tlsopenssl)
###############################################################################
# Dependency checks
###############################################################################
+AC_CHECK_FUNC([memfd_create], [AC_DEFINE([HAVE_MEMFD_CREATE], [1], [Define if memfd exists])])
AM_COND_IF([ENABLE_DPDK_SHARED],
[
DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_MB, dpdk_aesni_mb_pmd)
DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_GCM, dpdk_aesni_gcm_pmd)
-DETECT_DPDK_IS_1702_OR_1705()
-
AM_COND_IF([WITH_DPDK_AESNI_MB_PMD],
[
AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
AM_COND_IF([WITH_DPDK_AESNI_GCM_PMD],
[
- AM_COND_IF([DPDK_IS_1702_OR_1705],
- [
- AC_CHECK_LIB([isal_crypto], [aesni_gcm128_init],
- [with_isa_l_crypto_lib=yes],
- [AC_MSG_ERROR([isal_crypto library not found])])
- ],
- [
- AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
- [with_aesni_mb_lib=yes],
- [AC_MSG_ERROR([IPSec_MB library not found])])
- ])
+ AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
+ [with_aesni_mb_lib=yes],
+ [AC_MSG_ERROR([IPSec_MB library not found])])
])
m4_append([list_of_with], [aesni_mb_lib], [, ])
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],
+AM_COND_IF([ENABLE_G2],
[
- AC_CHECK_LIB([ibverbs], [ibv_fork_init],
- [with_ibverbs_lib=yes],
- [AC_MSG_ERROR([ibverbs library not found])])
+ PKG_CHECK_MODULES(g2, gtk+-2.0)
])
-DPDK_IS_PMD_ENABLED(LIBRTE_MLX5_PMD, dpdk_mlx5_pmd)
-AM_COND_IF([WITH_DPDK_MLX5_PMD],
+AM_COND_IF([ENABLE_MARVELL_PLUGIN],
[
- AC_CHECK_LIB([ibverbs], [ibv_fork_init],
- [with_ibverbs_lib=yes],
- [AC_MSG_ERROR([ibverbs library not found])])
+ AC_CHECK_LIB( [musdk], [pp2_init],
+ [],
+ [
+ AC_MSG_WARN([Marvell MUSDK library with PP2 support not found. Plugin disabled.])
+ enable_marvell_plugin=no
+ AM_CONDITIONAL(ENABLE_MARVELL_PLUGIN, false)
+ ])
])
-m4_append([list_of_with], [ibverbs_lib], [, ])
-AM_CONDITIONAL(WITH_IBVERBS_LIB, test "$with_ibverbs_lib" = "yes")
-
-
-AM_COND_IF([ENABLE_G2],
+AM_COND_IF([WITH_MBEDTLS], [],
[
- PKG_CHECK_MODULES(g2, gtk+-2.0)
+ AC_MSG_WARN([mbedtls not enabled. Disabling tlsmbedtls plugin])
+ enable_tlsmbedtls_plugin=no
+ AM_CONDITIONAL(ENABLE_TLSMBEDTLS_PLUGIN, false)
])
-# If cross-compiling, we need external vppapigen and we cannot continue without it
-# For native builds, we just set dependency on vpppaigen binary in top_builddir
-AM_COND_IF([CROSSCOMPILE],
+AM_COND_IF([ENABLE_TLSMBEDTLS_PLUGIN],
[
- AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
- if test "$VPPAPIGEN" = "no"; then
- AC_MSG_ERROR([Externaly built vppapigen is needed when cross-compiling...])
- fi
-],[
- VPPAPIGEN=\$\(top_builddir\)/vppapigen
+ AC_CHECK_HEADERS([mbedtls/ssl.h], [],
+ [
+ AC_MSG_WARN([mbedtls headers not found. TLS engine implementation disabled])
+ enable_tlsmbedtls_plugin=no
+ AM_CONDITIONAL(ENABLE_TLSMBEDTLS_PLUGIN, false)
+ ], [])
])
-AC_SUBST([VPPAPIGEN])
+AM_COND_IF([WITH_LIBSSL], [],
+[
+ AC_MSG_WARN([openssl not enabled. Disabling tlsopenssl plugin])
+ enable_tlsopenssl_plugin=no
+ AM_CONDITIONAL(ENABLE_TLSOPENSSL_PLUGIN, false)
+])
###############################################################################
# JAVA
Code Review / vpp.git / blobdiff