X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=4c9c25d5d98f80d079f568498c99db85c36bd230;hb=refs%2Fchanges%2F47%2F14547%2F3;hp=fb7ae8128aa3f7c0ff2c87c3347dbbc4f52192e8;hpb=3451d98550228b9742e8ff4577dd4a1ee6791efc;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index fb7ae8128aa..4c9c25d5d98 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -7,7 +7,6 @@ AC_CONFIG_FILES([ \
   Makefile \
   plugins/Makefile \
   vpp-api/python/Makefile \
-  vpp-api/java/Makefile \
   vpp-api/vapi/Makefile \
   vlib/config.h \
   vppinfra/config.h \
@@ -197,9 +196,9 @@ ENABLE_ARG(dlmalloc,    [Enable dlmalloc])
 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])
 
 # --with-X
+WITH_ARG(dpdk_mlx5_pmd, [Enable Mellanox DPDK PMD driver])
 
 # --without-X
 WITHOUT_ARG(libssl,	[Disable libssl])
@@ -282,7 +281,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,              [-DUSE_DLMALLOC=${n_enable_dlmalloc}])
+AC_SUBST(DLMALLOC,              [${n_enable_dlmalloc}])
 
 AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
 AC_DEFINE_UNQUOTED(WITH_LIBSSL,		[${n_with_libssl}])
@@ -316,11 +315,12 @@ PLUGIN_ENABLED(l2e)
 PLUGIN_ENABLED(lacp)
 PLUGIN_ENABLED(lb)
 PLUGIN_ENABLED(mactime)
+PLUGIN_ENABLED(map)
 PLUGIN_ENABLED(marvell)
 PLUGIN_ENABLED(memif)
-PLUGIN_ENABLED(pppoe)
 PLUGIN_ENABLED(nat)
-PLUGIN_ENABLED(map)
+PLUGIN_ENABLED(nsh)
+PLUGIN_ENABLED(pppoe)
 PLUGIN_ENABLED(srv6ad)
 PLUGIN_ENABLED(srv6am)
 PLUGIN_ENABLED(srv6as)
@@ -416,19 +416,6 @@ AM_COND_IF([WITH_LIBSSL],
   AM_CONDITIONAL(ENABLE_TLSOPENSSL_PLUGIN, false)
 ])
 
-###############################################################################
-# JAVA
-###############################################################################
-
-AM_COND_IF([ENABLE_JAPI],
-[
-  AX_VPP_FIND_JDK8
-  AC_SUBST(JAVA_HOME)
-  AC_SUBST(JAVAC)
-  AC_SUBST(JAVAH)
-  AC_SUBST(JAR)
-])
-
 ###############################################################################
 # PYTHON
 ###############################################################################
@@ -454,11 +441,6 @@ 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})
-  PRINT_VAL([JAVA_HOME], ${JAVA_HOME})
-])
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([with:])