Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move VOM to extras/vom
[vpp.git]
/
src
/
configure.ac
diff --git
a/src/configure.ac
b/src/configure.ac
index
857bd01
..
2a54cd2
100644
(file)
--- a/
src/configure.ac
+++ b/
src/configure.ac
@@
-1,17
+1,15
@@
-AC_INIT([vpp], [18.0
4
], [vpp-dev@fd.io])
+AC_INIT([vpp], [18.0
7
], [vpp-dev@fd.io])
LT_INIT
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([subdir-objects])
AM_SILENT_RULES([yes])
LT_INIT
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([subdir-objects])
AM_SILENT_RULES([yes])
-AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile
vpp-api/vom/Makefile
])
+AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
-AC_PROG_CXX
AC_PROG_CPP
AM_PROG_AS
AM_PROG_LIBTOOL
AC_PROG_CPP
AM_PROG_AS
AM_PROG_LIBTOOL
-AC_PROG_YACC
AM_PATH_PYTHON
AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"])
AM_PATH_PYTHON
AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"])
@@
-130,7
+128,6
@@
DISABLE_ARG(vlib, [Disable vlib and dependant libs and binaries])
DISABLE_ARG(svm, [Disable svm and dependant libs and binaries])
DISABLE_ARG(papi, [Disable Python API bindings])
DISABLE_ARG(japi, [Disable Java API bindings])
DISABLE_ARG(svm, [Disable svm and dependant libs and binaries])
DISABLE_ARG(papi, [Disable Python API bindings])
DISABLE_ARG(japi, [Disable Java API bindings])
-DISABLE_ARG(vom, [Disable VPP object model bindings])
# --with-X
# --with-X
@@
-188,6
+185,14
@@
AC_SUBST([CPU_AVX512_FLAGS],"-march=skylake-avx512 -mtune=skylake-avx512")
AM_CONDITIONAL([CPU_X86_64], [test "$build_cpu" = "x86_64"])
AM_CONDITIONAL([CPU_AARCH64], [test "$build_cpu" = "aarch64"])
AM_CONDITIONAL([CPU_X86_64], [test "$build_cpu" = "x86_64"])
AM_CONDITIONAL([CPU_AARCH64], [test "$build_cpu" = "aarch64"])
+###############################################################################
+# misc compiler flags
+###############################################################################
+
+CC_CHECK_FLAG("-Wno-address-of-packed-member")
+AS_IF([test "$cc_flag_check" = yes],
+ [CFLAGS="${CFLAGS} -Wno-address-of-packed-member"], [])
+
###############################################################################
# Substitutions and defines
###############################################################################
###############################################################################
# Substitutions and defines
###############################################################################
@@
-210,30
+215,37
@@
AC_SUBST(AR_FLAGS)
###############################################################################
# Please keep alphabetical order
###############################################################################
# Please keep alphabetical order
+PLUGIN_ENABLED(abf)
PLUGIN_ENABLED(acl)
PLUGIN_ENABLED(acl)
+PLUGIN_ENABLED(avf)
+PLUGIN_ENABLED(cdp)
PLUGIN_ENABLED(dpdk)
PLUGIN_ENABLED(flowprobe)
PLUGIN_ENABLED(gbp)
PLUGIN_ENABLED(gtpu)
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(ila)
PLUGIN_ENABLED(ioam)
PLUGIN_ENABLED(ixge)
PLUGIN_ENABLED(kubeproxy)
PLUGIN_ENABLED(l2e)
+PLUGIN_ENABLED(lacp)
PLUGIN_ENABLED(lb)
PLUGIN_ENABLED(marvell)
PLUGIN_ENABLED(memif)
PLUGIN_ENABLED(pppoe)
PLUGIN_ENABLED(nat)
PLUGIN_ENABLED(lb)
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(srv6ad)
PLUGIN_ENABLED(srv6am)
PLUGIN_ENABLED(srv6as)
PLUGIN_ENABLED(stn)
+PLUGIN_ENABLED(tlsmbedtls)
+PLUGIN_ENABLED(tlsopenssl)
###############################################################################
# Dependency checks
###############################################################################
###############################################################################
# Dependency checks
###############################################################################
+AC_CHECK_FUNC([memfd_create], [AC_DEFINE([HAVE_MEMFD_CREATE], [1], [Define if memfd exists])])
AM_COND_IF([ENABLE_DPDK_SHARED],
[
AM_COND_IF([ENABLE_DPDK_SHARED],
[
@@
-287,19
+299,29
@@
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_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
+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
###############################################################################
# JAVA