build: make flow classification optional

Add the flow_classify library to the list of optional libraries, and
ensure tests can build with it disabled.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: David Marchand <david.marchand@redhat.com>

diff --git a/app/test/meson.build b/app/test/meson.build
index 210e03fbff00b61730ec3b85e6d768e328c4387c..a39dd689342be10eb8c281b56ab89de7d5a97de6 100644 (file)
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -65,7 +65,6 @@ test_sources = files(
         'test_fib6.c',
         'test_fib6_perf.c',
         'test_func_reentrancy.c',
-        'test_flow_classify.c',
         'test_graph.c',
         'test_graph_perf.c',
         'test_hash.c',
@@ -196,7 +195,6 @@ fast_tests = [
         ['fib_autotest', true],
         ['fib6_autotest', true],
         ['func_reentrancy_autotest', false],
-        ['flow_classify_autotest', false],
         ['hash_autotest', true],
         ['interrupt_autotest', true],
         ['ipfrag_autotest', false],
@@ -349,6 +347,11 @@ endif
 if dpdk_conf.has('RTE_EVENT_SKELETON')
     test_deps += 'event_skeleton'
 endif
+
+if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY')
+    test_sources += 'test_flow_classify.c'
+    fast_tests += [['flow_classify_autotest', false]]
+endif
 if dpdk_conf.has('RTE_LIB_METRICS')
     test_sources += ['test_metrics.c']
     fast_tests += [['metrics_autotest', true]]

diff --git a/lib/meson.build b/lib/meson.build
index dd20fe70a659b627c6d3a3292f83a94d1521e885..ede519937475b45ba4e86c21f519cca4fcee742f 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -67,6 +67,7 @@ libraries = [
 
 optional_libs = [
         'bitratestats',
+        'flow_classify',
         'gpudev',
         'gro',
         'gso',