diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-14 14:19:20 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-15 20:29:26 +0100 |
| commit | cd6116e58f863202a9072b97fc32b1b50f9e1ba3 (patch) | |
| tree | 312e6ab83ad42294666e76dbac70131b980600f7 | |
| parent | a3f77b259cea16f32d6428cbba03f0409b1dd96e (diff) | |
| download | NetworkManager-cd6116e58f863202a9072b97fc32b1b50f9e1ba3.tar.gz | |
wifi: remove configure checks for suitable linux/nl80211.h header
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.
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | meson.build | 17 |
2 files changed, 0 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 92e1588309..9008ef88a2 100644 --- a/configure.ac +++ b/configure.ac @@ -224,24 +224,6 @@ else fi 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 Default to using wpa_supplicant but allow IWD as wifi backend dnl diff --git a/meson.build b/meson.build index b3bb97189c..6942103f27 100644 --- a/meson.build +++ b/meson.build @@ -269,23 +269,6 @@ if dist_version != '' endif 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) enable_iwd = get_option('iwd') |