diff --git a/configure.ac b/configure.ac index 598e44a367..020d78442c 100644 --- a/configure.ac +++ b/configure.ac @@ -427,15 +427,6 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) -# Check for Linux vs. BSD ifreq members -AC_CHECK_MEMBERS([struct ifreq.ifr_newname, - struct ifreq.ifr_ifindex, - struct ifreq.ifr_index, - struct ifreq.ifr_hwaddr], - [], [], - [#include - #include - ]) # Check for BSD kvm (kernel memory interface) if test $with_freebsd = yes; then diff --git a/meson.build b/meson.build index 18f85ab514..990faa5d46 100644 --- a/meson.build +++ b/meson.build @@ -848,6 +848,25 @@ if host_machine.system() == 'windows' endif +# check various members + +members = [ + # Check for Linux vs. BSD ifreq members + [ 'struct ifreq', 'ifr_newname', '#include \n#include ' ], + [ 'struct ifreq', 'ifr_ifindex', '#include \n#include ' ], + [ 'struct ifreq', 'ifr_index', '#include \n#include ' ], + [ 'struct ifreq', 'ifr_hwaddr', '#include \n#include ' ], +] + +foreach member : members + if cc.has_member(member[0], member[1], prefix: member[2]) + type = member[0].underscorify().to_upper() + member = member[1].underscorify().to_upper() + conf.set('HAVE_@0@_@1@'.format(type, member), 1) + endif +endforeach + + # define top include directory top_inc_dir = include_directories('.')