X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=c213454dbda30f3ef3dced6d8a65938991853cc8;hb=5fda7a3925be145f0c326d0aecc36d883cbcb2ee;hp=d28b6c1ccfdeac0df00b361091ba126d6d9f09e4;hpb=ba7992aa62523d014b55802463fb3357c7099b70;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index d28b6c1ccfd..c213454dbda 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -211,20 +211,23 @@ AC_SUBST(AR_FLAGS)
 PLUGIN_ENABLED(acl)
 PLUGIN_ENABLED(dpdk)
 PLUGIN_ENABLED(flowprobe)
+PLUGIN_ENABLED(gbp)
 PLUGIN_ENABLED(gtpu)
 PLUGIN_ENABLED(ila)
 PLUGIN_ENABLED(ioam)
 PLUGIN_ENABLED(ixge)
 PLUGIN_ENABLED(kubeproxy)
+PLUGIN_ENABLED(l2e)
 PLUGIN_ENABLED(lb)
 PLUGIN_ENABLED(marvell)
 PLUGIN_ENABLED(memif)
 PLUGIN_ENABLED(pppoe)
+PLUGIN_ENABLED(nat)
 PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(srv6ad)
+PLUGIN_ENABLED(srv6am)
 PLUGIN_ENABLED(srv6as)
-PLUGIN_ENABLED(nat)
 PLUGIN_ENABLED(stn)
-PLUGIN_ENABLED(l2e)
 
 ###############################################################################
 # Dependency checks
@@ -304,19 +307,10 @@ AM_COND_IF([ENABLE_MARVELL_PLUGIN],
     ])
 ])
 
-# 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],
-[
-  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_SUBST([VPPAPIGEN])
-
+AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
+if test "$VPPAPIGEN" = "no"; then
+   VPPAPIGEN=\$\(top_srcdir\)/tools/vppapigen/vppapigen
+fi
 
 ###############################################################################
 # JAVA