build: use more generic naming for PCAP PKTIO test

PCAP pktio is a platform specific concept which is used throughout the
examples and tests. Therefore rename it so that it's more clear that
this flag is checking whether there is a PCAP pktio support rather than
PCAP libraries available.

Signed-off-by: Stanislaw Kardach <skardach@marvell.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>

11 files changed, 12 insertions, 14 deletions

diff --git a/example/l2fwd_simple/Makefile.am b/example/l2fwd_simple/Makefile.am
index f082335ef..dfde589c2 100644
--- a/example/l2fwd_simple/Makefile.am
+++ b/example/l2fwd_simple/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = odp_l2fwd_simple
 odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c
 
 if test_example
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS = l2fwd_simple_run.sh
 endif
 endif
diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am
index 9a48ea173..fc7a35bc5 100644
--- a/example/l3fwd/Makefile.am
+++ b/example/l3fwd/Makefile.am
@@ -9,11 +9,9 @@ odp_l3fwd_SOURCES = \
 		    odp_l3fwd_db.h \
 		    odp_l3fwd_lpm.h
 
-
 if test_example
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS = odp_l3fwd_run.sh
 endif
 endif
-
 EXTRA_DIST = odp_l3fwd_run.sh udp64.pcap
diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am
index 6b5fe2312..3682d26d5 100644
--- a/example/packet/Makefile.am
+++ b/example/packet/Makefile.am
@@ -8,7 +8,7 @@ odp_packet_dump_SOURCES = odp_packet_dump.c
 odp_pktio_SOURCES = odp_pktio.c
 
 if test_example
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS = packet_dump_run.sh pktio_run.sh
 endif
 endif
diff --git a/example/ping/Makefile.am b/example/ping/Makefile.am
index c5d59342c..df02d567b 100644
--- a/example/ping/Makefile.am
+++ b/example/ping/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = odp_ping
 odp_ping_SOURCES = odp_ping.c
 
 if test_example
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS = ping_run.sh
 endif
 endif
diff --git a/example/simple_pipeline/Makefile.am b/example/simple_pipeline/Makefile.am
index e94cd1143..5a4c523e4 100644
--- a/example/simple_pipeline/Makefile.am
+++ b/example/simple_pipeline/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = odp_simple_pipeline
 odp_simple_pipeline_SOURCES = odp_simple_pipeline.c
 
 if test_example
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS = simple_pipeline_run.sh
 endif
 endif
diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am
index 2fb21bc41..210f04317 100644
--- a/example/switch/Makefile.am
+++ b/example/switch/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = odp_switch
 odp_switch_SOURCES = odp_switch.c
 
 if test_example
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS = switch_run.sh
 endif
 endif
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 267d02a7d..33be2f575 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -339,7 +339,7 @@ noinst_HEADERS += arch/x86/cpu_flags.h \
 		  arch/default/odp_cpu_idling.h
 endif
 
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 __LIB__libodp_linux_la_SOURCES += pktio/pcap.c
 endif
 
@@ -350,6 +350,6 @@ __LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LIBODP)
 __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS)
 __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS)
 
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 __LIB__libodp_linux_la_LIBADD += $(PCAP_LIBS)
 endif
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index 62146bfa0..88f928f7a 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -14,7 +14,7 @@ AC_ARG_WITH([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])
+AM_CONDITIONAL([ODP_PKTIO_PCAP], [test x$have_pcap = xyes])
 
 m4_include([platform/linux-generic/m4/odp_libconfig.m4])
 m4_include([platform/linux-generic/m4/odp_pcapng.m4])
diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am
index 870336fd2..b025d1331 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS += validation/api/pktio\
 	  validation/api/shmem\
 	  pktio_ipc
 
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTS += validation/api/pktio/pktio_run_pcap.sh
 endif
 if netmap_support
diff --git a/platform/linux-generic/test/validation/api/pktio/Makefile.am b/platform/linux-generic/test/validation/api/pktio/Makefile.am
index 4a1434397..385700de8 100644
--- a/platform/linux-generic/test/validation/api/pktio/Makefile.am
+++ b/platform/linux-generic/test/validation/api/pktio/Makefile.am
@@ -2,7 +2,7 @@ dist_check_SCRIPTS = pktio_env \
 		     pktio_run.sh \
 		     pktio_run_tap.sh
 
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 dist_check_SCRIPTS += pktio_run_pcap.sh
 endif
 if netmap_support
diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
index 4b32573cd..d70eb9636 100644
--- a/test/performance/Makefile.am
+++ b/test/performance/Makefile.am
@@ -25,7 +25,7 @@ TESTSCRIPTS = odp_l2fwd_run.sh \
 	      odp_sched_pktio_run.sh \
 	      odp_scheduling_run.sh
 
-if HAVE_PCAP
+if ODP_PKTIO_PCAP
 TESTSCRIPTS += odp_pktio_ordered_run.sh
 endif