X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=7733daa6599db23c6365304a6a95fa842b188e26;hb=cc4a5e8089967f0c266e9c5ed319c38c111004cd;hp=8830c68deffd42216c40737f44ad2026e6d91683;hpb=6a5adc369591fcac2447e9809deaa22f56b53911;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index 8830c68deff..7733daa6599 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([vpp], [18.11], [vpp-dev@fd.io])
+AC_INIT([vpp], [18.10], [vpp-dev@fd.io])
 LT_INIT
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -7,9 +7,9 @@ AC_CONFIG_FILES([ \
   Makefile \
   plugins/Makefile \
   vpp-api/python/Makefile \
-  vpp-api/java/Makefile \
   vpp-api/vapi/Makefile \
   vlib/config.h \
+  vppinfra/config.h \
 ])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -196,7 +196,6 @@ 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
 
@@ -281,7 +280,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}])
@@ -326,6 +325,7 @@ PLUGIN_ENABLED(srv6as)
 PLUGIN_ENABLED(stn)
 PLUGIN_ENABLED(tlsmbedtls)
 PLUGIN_ENABLED(tlsopenssl)
+PLUGIN_ENABLED(unittest)
 
 ###############################################################################
 # Dependency checks
@@ -414,19 +414,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
 ###############################################################################
@@ -452,11 +439,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:])