colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: remove configure checks for suitable linux/nl80211.h header

Browse Source 
The check doesn't seem useful, because it does not result in a fallback
or a different build.

Just assume <linux/nl80211.h> is valid. In case it is not, we will get a
build failure later. That is just as good.
This commit is contained in:
Thomas Haller
2018-01-14 14:19:20 +01:00
parent a3f77b259c
commit cd6116e58f
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@@ -224,24 +224,6 @@ else
fi fi
AM_CONDITIONAL(WITH_WEXT, test x"${ac_with_wext}" = x"yes") AM_CONDITIONAL(WITH_WEXT, test x"${ac_with_wext}" = x"yes")
AC_MSG_CHECKING([Linux kernel nl80211 headers])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#ifndef __user
#define __user
#endif
#include <sys/types.h>
#include <linux/types.h>
#include <sys/socket.h>
#include <linux/nl80211.h>]],
[[int a = NL80211_RATE_INFO_BITRATE; a++;]])],
[ac_have_nl80211=yes],
[ac_have_nl80211=no])
AC_MSG_RESULT($ac_have_nl80211)
if test "$ac_have_nl80211" = no; then
AC_MSG_ERROR(Linux kernel development header linux/nl80211.h not installed or not functional)
fi
dnl dnl
dnl Default to using wpa_supplicant but allow IWD as wifi backend dnl Default to using wpa_supplicant but allow IWD as wifi backend
dnl dnl

17
meson.build
View File

@@ -269,23 +269,6 @@ if dist_version != ''
endif endif
enable_wifi = get_option('wifi') enable_wifi = get_option('wifi')
if enable_wifi
nl80211_src = '''
#ifndef __user
#define __user
#endif
#include <sys/types.h>
#include <linux/types.h>
#include <sys/socket.h>
#include <linux/nl80211.h>
int main() {
int a = NL80211_RATE_INFO_BITRATE;
a++;
}
'''
assert(cc.compiles(nl80211_src), 'Linux kernel development header linux/nl80211.h not installed or not functional')
endif
config_h.set10('WITH_WIFI', enable_wifi) config_h.set10('WITH_WIFI', enable_wifi)
enable_iwd = get_option('iwd') enable_iwd = get_option('iwd')