X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=4bdfa8c6bdeaef2e8747f2d1ea599d0aab398420;hb=bc27d1be24815e1371dcce3bff2d3075a532acba;hp=d84a4817dd4b29326df66dc773ff01df7516120d;hpb=45b485099d8bdf5985e9869bc8221852073f9369;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index d84a4817dd4..4bdfa8c6bde 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([vpp], [18.01], [vpp-dev@fd.io])
+AC_INIT([vpp], [18.04], [vpp-dev@fd.io])
 LT_INIT
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -215,12 +215,19 @@ PLUGIN_ENABLED(gtpu)
 PLUGIN_ENABLED(ila)
 PLUGIN_ENABLED(ioam)
 PLUGIN_ENABLED(ixge)
+PLUGIN_ENABLED(kubeproxy)
 PLUGIN_ENABLED(lb)
+PLUGIN_ENABLED(marvell)
 PLUGIN_ENABLED(memif)
 PLUGIN_ENABLED(pppoe)
 PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(srv6ad)
+PLUGIN_ENABLED(srv6am)
+PLUGIN_ENABLED(srv6as)
 PLUGIN_ENABLED(nat)
 PLUGIN_ENABLED(stn)
+PLUGIN_ENABLED(l2e)
+PLUGIN_ENABLED(gbp)
 
 ###############################################################################
 # Dependency checks
@@ -289,19 +296,21 @@ AM_COND_IF([ENABLE_G2],
   PKG_CHECK_MODULES(g2, gtk+-2.0)
 ])
 
-# If cross-compiling, we need external vppapigen and we cannot continue without it
-# For native builds, we just set dependency on vpppaigen binary in top_builddir
-AM_COND_IF([CROSSCOMPILE],
+AM_COND_IF([ENABLE_MARVELL_PLUGIN],
 [
-  AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
-  if test "$VPPAPIGEN" = "no"; then
-    AC_MSG_ERROR([Externaly built vppapigen is needed when cross-compiling...])
-  fi
-],[
-  VPPAPIGEN=\$\(top_builddir\)/vppapigen
+  AC_CHECK_LIB( [musdk], [pp2_init],
+    [],
+    [
+      AC_MSG_WARN([Marvell MUSDK library with PP2 support not found. Plugin disabled.])
+      enable_marvell_plugin=no
+      AM_CONDITIONAL(ENABLE_MARVELL_PLUGIN, false)
+    ])
 ])
-AC_SUBST([VPPAPIGEN])
 
+AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
+if test "$VPPAPIGEN" = "no"; then
+   VPPAPIGEN=\$\(top_srcdir\)/tools/vppapigen/vppapigen
+fi
 
 ###############################################################################
 # JAVA