dpdk: rework cryptodev ipsec build and setup

[vpp.git] / src / configure.ac

diff --git a/src/configure.ac b/src/configure.ac
index 4ed5570..49da624 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -10,6 +10,9 @@ AC_PROG_CC
 AM_PROG_AS
 AM_PROG_LIBTOOL
 AC_PROG_YACC
+AM_PATH_PYTHON
+
+AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"])
 
 ###############################################################################
 # Macros
@@ -95,12 +98,11 @@ 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
-WITHOUT_ARG(ipsec,     [Disable IPSec])
-WITHOUT_ARG(ipv6sr,    [Disable IPv6 SR])
+WITHOUT_ARG(libssl,    [Disable libssl])
 WITHOUT_ARG(apicli,    [Disable binary api CLI])
 
 AC_ARG_WITH(unix,
@@ -130,9 +132,8 @@ 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(IPSEC,              [${n_with_ipsec}])
-AC_DEFINE_UNQUOTED(IPV6SR,             [${n_with_ipv6sr}])
+AC_DEFINE_UNQUOTED(DPDK_CRYPTO_SW,     [${n_with_dpdk_crypto_sw}])
+AC_DEFINE_UNQUOTED(WITH_LIBSSL,                [${n_with_libssl}])
 
 
 # Silence following noise:
@@ -172,6 +173,20 @@ 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],
+[
+  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])
+
+
 ###############################################################################
 # JAVA
 ###############################################################################