From d2292cc649ac81a88e0b324d36c47caab30d9ba9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 14 Jan 2018 14:26:10 +0100 Subject: [PATCH] wifi: remove configure checks for suitable WEXT header The check doesn't seem useful, because it does not result in a fallback or a different build. Just assume is valid. In case it is not, we will get a build failure later. That is just as good. --- configure.ac | 19 ------------------- meson.build | 18 ------------------ 2 files changed, 37 deletions(-) diff --git a/configure.ac b/configure.ac index 9008ef88a..5c694ef84 100644 --- a/configure.ac +++ b/configure.ac @@ -199,25 +199,6 @@ if test x"$ac_with_wext" = x"yes"; then if test "$enable_wifi" != "yes"; then AC_MSG_ERROR(Enabling WEXT support and disabling Wi-Fi makes no sense) fi - AC_MSG_CHECKING([Linux kernel WEXT headers]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#ifndef __user - #define __user - #endif - #include - #include - #include - #include ]], - [[#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]) else AC_DEFINE(HAVE_WEXT, 0, [Define if you have Linux Wireless Extensions support]) diff --git a/meson.build b/meson.build index 6942103f2..e59be17f9 100644 --- a/meson.build +++ b/meson.build @@ -277,25 +277,7 @@ if enable_iwd endif config_h.set10('WITH_IWD', enable_iwd) -# Default to using WEXT but allow it to be disabled 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 - #include - #include - #include - #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) # Checks for libdl - on certain platforms its part of libc