This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, master has been updated via 78364dc1d53a1a4c4918ce0a82d02fe56f0abb54 (commit) from 9bdd6ed64a1603f15c869be637093abb88f196a8 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 78364dc1d53a1a4c4918ce0a82d02fe56f0abb54 Author: Matias Elo matias.elo@nokia.com Date: Thu May 16 12:56:48 2019 +0300

configure: add option to disable pcap pktio support

Add '--without-pcap' option to explicitly build ODP without PCAP pktio regardless of if the library is available on the build host.

Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com Suggested-by: Risto Reittinen risto.teittinen@nokia-bell-labs.com

diff --git a/.travis.yml b/.travis.yml index ea26ddedd..a32b48e0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ env: - CONF="--disable-host-optimization --disable-abi-compat" - CHECK=0 ARCH="x86_64" CONF="--enable-pcapng-support" - CHECK=0 ARCH="x86_64" OS="centos_7" - - CONF="--without-openssl" + - CONF="--without-openssl --without-pcap" - OS="ubuntu_18.04"

matrix: diff --git a/platform/linux-generic/m4/odp_pcap.m4 b/m4/odp_pcap.m4 similarity index 65% rename from platform/linux-generic/m4/odp_pcap.m4 rename to m4/odp_pcap.m4 index 0a8f35186..239ce385f 100644 --- a/platform/linux-generic/m4/odp_pcap.m4 +++ b/m4/odp_pcap.m4 @@ -1,3 +1,7 @@ +# ODP_PCAP([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# -------------------------------------------------- +AC_DEFUN([ODP_PCAP], +[dnl ######################################################################### # Check for libpcap availability ######################################################################### @@ -11,10 +15,15 @@ AC_CHECK_HEADER(pcap/pcap.h, if test "$have_pcap" = "yes"; then AC_DEFINE([HAVE_PCAP], 1, [Define to 1 if you have pcap library]) PCAP_LIBS="-lpcap" +else + PCAP_LIBS="" fi

AC_SUBST([PCAP_LIBS])

-AC_CONFIG_COMMANDS_PRE([dnl -AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) -]) +if test "x$have_pcap" = "xyes" ; then + m4_default([$1], [:]) +else + m4_default([$2], [:]) +fi +]) # ODP_PCAP diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 1dd14cd4d..3ab01f2b7 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -13,8 +13,17 @@ AC_ARG_WITH([openssl], AS_IF([test "$with_openssl" != "no"], [ODP_OPENSSL]) AM_CONDITIONAL([WITH_OPENSSL], [test x$with_openssl != xno]) + +AC_ARG_WITH([pcap], + [AS_HELP_STRING([--without-pcap], + [compile without PCAP])], + [], + [with_pcap=yes]) +AS_IF([test "x$with_pcap" != xno], + [ODP_PCAP([with_pcap=yes]‚[with_pcap=no])]) +AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) + ODP_LIBCONFIG([linux-generic]) -m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_pcapng.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4])

-----------------------------------------------------------------------

Summary of changes: .travis.yml | 2 +- {platform/linux-generic/m4 => m4}/odp_pcap.m4 | 15 ++++++++++++--- platform/linux-generic/m4/configure.m4 | 11 ++++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) rename {platform/linux-generic/m4 => m4}/odp_pcap.m4 (65%)

hooks/post-receive