Move java api to extras/

[vpp.git] / src / configure.ac

diff --git a/src/configure.ac b/src/configure.ac
index 428e15d..7733daa 100644 (file)
--- 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])
@@ -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])
 
@@ -190,12 +190,12 @@ 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])
 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
 
@@ -232,6 +232,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 +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,              [${n_enable_dlmalloc}])
 
 AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,    [${n_enable_dpdk_shared}])
 AC_DEFINE_UNQUOTED(WITH_LIBSSL,                [${n_with_libssl}])
@@ -310,16 +313,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
@@ -408,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
 ###############################################################################
@@ -445,11 +438,7 @@ PRINT_VAL([CFLAGS], ${CFLAGS})
 PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
 PRINT_VAL([LDFLAGS], ${LDFLAGS})
 PRINT_VAL([LOG2_CACHE_LINE_BYTES], ${with_log2_cache_line_bytes})
-AM_COND_IF([ENABLE_JAPI],
-[
-  PRINT_VAL([JAVA_VERSION], ${JAVA_VERSION})
-  PRINT_VAL([JAVA_HOME], ${JAVA_HOME})
-])
+PRINT_VAL([DLMALLOC], ${enable_dlmalloc})
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([with:])