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

wifi: remove configure checks for suitable WEXT header

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

Just assume <linux/wireless.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:26:10 +01:00
parent cd6116e58f
commit d2292cc649
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@@ -199,25 +199,6 @@ if test x"$ac_with_wext" = x"yes"; then
if test "$enable_wifi" != "yes"; then if test "$enable_wifi" != "yes"; then
AC_MSG_ERROR(Enabling WEXT support and disabling Wi-Fi makes no sense) AC_MSG_ERROR(Enabling WEXT support and disabling Wi-Fi makes no sense)
fi fi
AC_MSG_CHECKING([Linux kernel WEXT 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/wireless.h>]],
[[#ifndef IWEVGENIE
#error "not found"
#endif]])],
[ac_have_iwevgenie=yes],
[ac_have_iwevgenie=no])
AC_MSG_RESULT($ac_have_iwevgenie)
if test "$ac_have_iwevgenie" = no; then
AC_MSG_ERROR(Linux kernel development header linux/wireless.h not installed or not functional)
fi
AC_DEFINE(HAVE_WEXT, 1, [Define if you have Linux Wireless Extensions support]) AC_DEFINE(HAVE_WEXT, 1, [Define if you have Linux Wireless Extensions support])
else else
AC_DEFINE(HAVE_WEXT, 0, [Define if you have Linux Wireless Extensions support]) AC_DEFINE(HAVE_WEXT, 0, [Define if you have Linux Wireless Extensions support])

18
meson.build
View File

@@ -277,25 +277,7 @@ if enable_iwd
endif endif
config_h.set10('WITH_IWD', enable_iwd) config_h.set10('WITH_IWD', enable_iwd)
# Default to using WEXT but allow it to be disabled
enable_wext = get_option('wext') enable_wext = get_option('wext')
if enable_wext
assert(enable_wifi, 'Enabling WEXT support and disabling Wi-Fi makes no sense')
iwevgenie_src = '''
#ifndef __user
#define __user
#endif
#include <sys/types.h>
#include <linux/types.h>
#include <sys/socket.h>
#include <linux/wireless.h>
#ifndef IWEVGENIE
#error "not found"
#endif
'''
assert(cc.compiles(iwevgenie_src), 'Linux kernel development header linux/wireless.h not installed or not functional')
endif
config_h.set10('HAVE_WEXT', enable_wext) config_h.set10('HAVE_WEXT', enable_wext)
# Checks for libdl - on certain platforms its part of libc # Checks for libdl - on certain platforms its part of libc