X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvnet.mk;h=cafb93933bd85b41c3e49dca61c7a9d40221717f;hb=bd05e17d79156fb72cb12a0d4855bfeaf44bfa32;hp=0486b4e8e8d074b75c031c311b96a8fd23a696d7;hpb=802c7fae4d3376440eda31973ddac6770c7565c3;p=vpp.git

diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk
index 0486b4e8e8d..cafb93933bd 100644
--- a/build-data/packages/vnet.mk
+++ b/build-data/packages/vnet.mk
@@ -6,23 +6,36 @@ vnet_configure_depend = 			\
 
 vnet_CPPFLAGS = $(call installed_includes_fn, 	\
     vppinfra 					\
-    openssl					\
     svm						\
     vlib 					\
     vlib-api)
 
 vnet_LDFLAGS = $(call installed_libs_fn, 	\
     vppinfra					\
-    openssl					\
     svm						\
     vlib					\
     vlib-api)
 
+ifeq ($($(PLATFORM)_enable_tests),yes)
+vnet_configure_args += --enable-tests
+endif
+
 # Platform dependent configure flags
 vnet_configure_args += $(vnet_configure_args_$(PLATFORM))
 
+# include & link with openssl only if needed
+ifneq ($($(PLATFORM)_uses_openssl),no)
+vnet_CPPFLAGS += $(call installed_includes_fn, openssl)
+vnet_LDFLAGS += $(call installed_libs_fn, openssl)
+endif
+
 ifneq ($($(PLATFORM)_uses_dpdk),no)
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+vnet_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+vnet_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
 vnet_configure_depend += dpdk-install
 vnet_CPPFLAGS += $(call installed_includes_fn, dpdk)
 vnet_LDFLAGS += $(call installed_libs_fn, dpdk)
 endif
+endif