X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=d4c7a7576d335d9394b4490c749eb4ac3b23ccd9;hb=5f21e1bd613b372ea6f8be6423894548dae59bdc;hp=428e15d3f4591114d2516c95716c32ace52dceaa;hpb=e43832c7e77b8b008ab452386b143bb3f7f5be40;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index 428e15d3f45..d4c7a7576d3 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([vpp], [18.07], [vpp-dev@fd.io])
+AC_INIT([vpp], [18.10], [vpp-dev@fd.io])
 LT_INIT
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -10,6 +10,7 @@ AC_CONFIG_FILES([ \
   vpp-api/java/Makefile \
   vpp-api/vapi/Makefile \
   vlib/config.h \
+  vppinfra/config.h \
 ])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -190,6 +191,7 @@ ENABLE_ARG(tests,	[Enable unit tests])
 ENABLE_ARG(dpdk_shared,	[Enable unit tests])
 ENABLE_ARG(perftool,	[Enable perftool])
 ENABLE_ARG(g2,		[Enable g2])
+ENABLE_ARG(dlmalloc,    [Enable dlmalloc])
 
 # --disable-X
 DISABLE_ARG(vlib,	[Disable vlib and dependant libs and binaries])
@@ -232,6 +234,8 @@ AC_ARG_WITH(pre-data,
                *) with_pre_data="pre-data-not-set" ;;
 	     esac], [with_pre_data=128])
 
+AM_CONDITIONAL(ENABLE_DLMALLOC, test "$enable_dlmalloc" = "yes")
+
 ###############################################################################
 # Target CPU flags
 ###############################################################################
@@ -278,6 +282,7 @@ AS_IF([test "$cc_flag_check" = yes],
 AC_SUBST(PRE_DATA_SIZE,		[$with_pre_data])
 AC_SUBST(LOG2_CACHE_LINE_BYTES, [$with_log2_cache_line_bytes])
 AC_SUBST(APICLI,		[-DVPP_API_TEST_BUILTIN=${n_with_apicli}])
+AC_SUBST(DLMALLOC,              [${n_enable_dlmalloc}])
 
 AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
 AC_DEFINE_UNQUOTED(WITH_LIBSSL,		[${n_with_libssl}])
@@ -310,16 +315,19 @@ PLUGIN_ENABLED(ixge)
 PLUGIN_ENABLED(l2e)
 PLUGIN_ENABLED(lacp)
 PLUGIN_ENABLED(lb)
+PLUGIN_ENABLED(mactime)
 PLUGIN_ENABLED(marvell)
 PLUGIN_ENABLED(memif)
 PLUGIN_ENABLED(pppoe)
 PLUGIN_ENABLED(nat)
+PLUGIN_ENABLED(map)
 PLUGIN_ENABLED(srv6ad)
 PLUGIN_ENABLED(srv6am)
 PLUGIN_ENABLED(srv6as)
 PLUGIN_ENABLED(stn)
 PLUGIN_ENABLED(tlsmbedtls)
 PLUGIN_ENABLED(tlsopenssl)
+PLUGIN_ENABLED(unittest)
 
 ###############################################################################
 # Dependency checks
@@ -445,6 +453,7 @@ PRINT_VAL([CFLAGS], ${CFLAGS})
 PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
 PRINT_VAL([LDFLAGS], ${LDFLAGS})
 PRINT_VAL([LOG2_CACHE_LINE_BYTES], ${with_log2_cache_line_bytes})
+PRINT_VAL([DLMALLOC], ${enable_dlmalloc})
 AM_COND_IF([ENABLE_JAPI],
 [
   PRINT_VAL([JAVA_VERSION], ${JAVA_VERSION})