X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=5e02adc11607d4f5f6c0fa58bbcee498b0b03812;hb=1bfb0ddace3ebb9010275e4bdd847c8c493ff4b3;hp=b2234448db76da723a2482a8de7f2377bb279ef2;hpb=a9a951f8e5ed6e172fbfbdbb6cb690c67fa2f715;p=vpp.git

diff --git a/src/configure.ac b/src/configure.ac
index b2234448db7..5e02adc1160 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -10,6 +10,7 @@ AC_PROG_CC
 AM_PROG_AS
 AM_PROG_LIBTOOL
 AC_PROG_YACC
+AM_PATH_PYTHON
 
 AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"])
 
@@ -73,7 +74,7 @@ AC_DEFUN([PLUGIN_DISABLED],
      AC_HELP_STRING([--enable-$1-plugin], [Build $1 plugin]),
        [enable_$1_plugin=yes ],
        [enable_$1_plugin=no])
-  AM_CONDITIONAL(m4_toupper((ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
   m4_append([list_of_plugins], [$1], [, ])
 ])
 
@@ -96,8 +97,7 @@ DISABLE_ARG(papi,	[Disable Python API bindings])
 DISABLE_ARG(japi,	[Disable Java API bindings])
 
 # --with-X
-WITH_ARG(dpdk,		[Use use DPDK])
-WITH_ARG(dpdk_crypto,	[Use DPDK cryptodev])
+WITH_ARG(dpdk_crypto_sw,[Use DPDK cryptodev SW PMDs])
 WITH_ARG(dpdk_mlx5_pmd,	[Use DPDK with mlx5 PMD])
 
 # --without-X
@@ -129,9 +129,8 @@ AC_ARG_WITH(pre-data,
 AC_SUBST(PRE_DATA_SIZE,		[$with_pre_data])
 AC_SUBST(APICLI,		[-DVPP_API_TEST_BUILTIN=${n_with_apicli}])
 
-AC_DEFINE_UNQUOTED(DPDK, 		[${n_with_dpdk}])
 AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
-AC_DEFINE_UNQUOTED(DPDK_CRYPTO,		[${n_with_dpdk_crypto}])
+AC_DEFINE_UNQUOTED(DPDK_CRYPTO_SW,	[${n_with_dpdk_crypto_sw}])
 AC_DEFINE_UNQUOTED(WITH_LIBSSL,		[${n_with_libssl}])
 
 
@@ -146,12 +145,15 @@ AC_SUBST(AR_FLAGS)
 
 # Please keep alphabetical order
 PLUGIN_ENABLED(acl)
+PLUGIN_ENABLED(dpdk)
 PLUGIN_ENABLED(flowperpkt)
 PLUGIN_ENABLED(ila)
 PLUGIN_ENABLED(ioam)
+PLUGIN_ENABLED(ixge)
 PLUGIN_ENABLED(lb)
 PLUGIN_ENABLED(sixrd)
 PLUGIN_ENABLED(snat)
+PLUGIN_DISABLED(srv6sample)
 
 ###############################################################################
 # Dependency checks
@@ -199,6 +201,15 @@ AM_COND_IF([ENABLE_JAPI],
   AC_SUBST(JAR)
 ])
 
+###############################################################################
+# PYTHON
+###############################################################################
+
+AM_COND_IF([ENABLE_PAPI],
+[
+  AM_PATH_PYTHON
+])
+
 ###############################################################################
 # Output
 ###############################################################################