X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp%2Fconfigure.ac;h=3eb7bb7cc91d89fc51412e01acd401922b4e25df;hb=b0ccf03b6e1d29b473e092d42768ced9f2ae8508;hp=f2756a305ef9c00383e21b620d6f5b341e48581d;hpb=61efa140b1f44e0c568697fbc31cf3f430131ab2;p=vpp.git diff --git a/vpp/configure.ac b/vpp/configure.ac index f2756a305ef..3eb7bb7cc91 100644 --- a/vpp/configure.ac +++ b/vpp/configure.ac @@ -1,8 +1,7 @@ AC_INIT(vpp, 1.1) AM_INIT_AUTOMAKE -AM_SILENT_RULES +AM_SILENT_RULES([yes]) -AC_PROG_LIBTOOL AM_PROG_AS AC_PROG_CC AM_PROG_CC_C_O @@ -12,6 +11,11 @@ AC_ARG_WITH(dpdk, [with_dpdk=1], [with_dpdk=0]) +AC_ARG_ENABLE(dpdk-shared, + AC_HELP_STRING([--enable-dpdk-shared],[Link with DPDK shared lib]), + [enable_dpdk_shared=1], + [enable_dpdk_shared=0]) + AC_ARG_WITH(ipsec, AC_HELP_STRING([--without-ipsec],[Disable ipsec]), [with_ipsec=0], @@ -28,7 +32,22 @@ AC_ARG_WITH(ipv6sr, [with_ipv6sr=1]) AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1") -AC_SUBST(DPDK,[-DDPDK=${with_dpdk}]) +AM_CONDITIONAL(ENABLE_DPDK_SHARED, test "$enable_dpdk_shared" = "1") +AC_SUBST(DPDK,["-DDPDK=${with_dpdk} -DDPDK_SHARED_LIB=${enable_dpdk_shared}"]) + +AM_COND_IF( + [ENABLE_DPDK_SHARED], + [ + AC_CHECK_HEADERS( + [rte_config.h], + [], [AC_MSG_ERROR([DPDK header files not found])], + ) + AC_CHECK_LIB( + [dpdk], [rte_eal_init], + [], [AC_MSG_ERROR([DPDK shared library not found])], + ) + ], +) AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1") AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])