diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-08-31 13:27:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-08-31 13:30:08 +0200 |
| commit | ee91f1f9ab66c16f3f902ad21713fac4100193f5 (patch) | |
| tree | a7460ee0eaaec19fabc8e84d05d7e7dd7c9d79a0 | |
| parent | 5ad119391ab794c30f529f5418194ad0dd729278 (diff) | |
| download | NetworkManager-ee91f1f9ab66c16f3f902ad21713fac4100193f5.tar.gz | |
build: define WITH_OPENVSWITCH in "config.h"
It will be used next.
| -rw-r--r-- | config.h.meson | 4 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | meson.build | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/config.h.meson b/config.h.meson index 5979793e5c..901535cf9f 100644 --- a/config.h.meson +++ b/config.h.meson @@ -224,6 +224,9 @@ /* Define if you have oFono support (experimental) */ #mesondefine WITH_OFONO +/* Whether we build with OVS plugin */ +#mesondefine WITH_OPENVSWITCH + /* Define if you have PPP support */ #mesondefine WITH_PPP @@ -261,3 +264,4 @@ /* Define to 1 if you have history support from -lreadline. */ #mesondefine HAVE_READLINE_HISTORY + diff --git a/configure.ac b/configure.ac index 3fc92d0892..a5e59514b0 100644 --- a/configure.ac +++ b/configure.ac @@ -851,6 +851,11 @@ if test "${enable_ovs}" != "no"; then fi fi AM_CONDITIONAL(WITH_OPENVSWITCH, test "${enable_ovs}" = "yes") +if test "${enable_ovs}" = "yes" ; then + AC_DEFINE(WITH_OPENVSWITCH, 1, [Whether we build with OVS plugin]) +else + AC_DEFINE(WITH_OPENVSWITCH, 0, [Whether we build with OVS plugin]) +fi # DHCP client support AC_ARG_WITH([dhclient], diff --git a/meson.build b/meson.build index 3c4be61509..40337b0e1b 100644 --- a/meson.build +++ b/meson.build @@ -644,6 +644,7 @@ enable_ovs = get_option('ovs') if enable_ovs assert(jansson_dep.found(), 'jansson is needed for Open vSwitch integration. Use -Dovs=false to disable it') endif +config_h.set10('WITH_OPENVSWITCH', enable_ovs) # DNS resolv.conf managers config_dns_rc_manager_default = get_option('config_dns_rc_manager_default') |