X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=6831c6b86444af87c15a101c2fe4ee2b600a0330;hb=d335dac3e2fe9704a9686f53017e17d4b5ba9ed7;hp=9ccf6901dd72b9ad73fcc51fa312e4f09290b4d7;hpb=802c7fae4d3376440eda31973ddac6770c7565c3;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 9ccf6901dd7..6831c6b8644 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -6,7 +6,11 @@ vpp_configure_depend =				\
 	vnet-install				\
 
 # 
-vpp_configure_args = 
+ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
+vpp_configure_args = --enable-dpdk-shared
+else
+vpp_configure_args =
+endif
 
 # Platform dependent configure flags
 vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
@@ -14,7 +18,6 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 vpp_CPPFLAGS = $(call installed_includes_fn,	\
 	vppinfra				\
-        openssl					\
 	svm					\
 	vlib					\
 	vlib-api				\
@@ -22,14 +25,27 @@ vpp_CPPFLAGS = $(call installed_includes_fn,	\
 
 vpp_LDFLAGS = $(call installed_libs_fn,		\
 	vppinfra				\
-	openssl					\
 	svm					\
 	vlib					\
 	vlib-api				\
 	vnet)
 
+# include & link with openssl only if needed
+ifneq ($($(PLATFORM)_uses_openssl),no)
+vpp_CPPFLAGS += $(call installed_includes_fn, openssl)
+vpp_LDFLAGS += $(call installed_libs_fn, openssl)
+endif
+
 ifneq ($($(PLATFORM)_uses_dpdk),no)
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
 vpp_configure_depend += dpdk-install
 vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)
 vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
 endif
+ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
+vpp_configure_args += --with-dpdk-crypto
+endif
+endif