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

build: Drop HAVE_VLAN_FLAG_LOOSE_BINDING

Browse Source 
Both meson and autotools define HAVE_VLAN_FLAG_LOOSE_BINDING to 1 or
0 depending if a small code snippet is compiled. However, this define
is not used anymore.

https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00060.html
This commit is contained in:
Iñigo Martínez
2017-12-18 20:32:46 +01:00
committed by Thomas Haller
parent 41f608dd91
commit 25d5384c30
3 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.meson
View File

@@ -53,9 +53,6 @@
/* Define if systemd support is available */ /* Define if systemd support is available */
#mesondefine HAVE_SYSTEMD #mesondefine HAVE_SYSTEMD
/* Define if you have VLAN_FLAG_LOOSE_BINDING */
#mesondefine HAVE_VLAN_FLAG_LOOSE_BINDING
/* Define if you have Linux Wireless Extensions support */ /* Define if you have Linux Wireless Extensions support */
#mesondefine HAVE_WEXT #mesondefine HAVE_WEXT

22
configure.ac
View File

@@ -299,28 +299,6 @@ else
fi fi
AM_CONDITIONAL(WITH_IWD, test x"${ac_with_iwd}" = x"yes") AM_CONDITIONAL(WITH_IWD, test x"${ac_with_iwd}" = x"yes")
dnl
dnl Check for newer VLAN flags
dnl
AC_MSG_CHECKING([Linux kernel VLAN_FLAG_LOOSE_BINDING enum value])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#ifndef __user
#define __user
#endif
#include <sys/types.h>
#include <linux/types.h>
#include <linux/if_vlan.h>]],
[[unsigned a = VLAN_FLAG_LOOSE_BINDING;]])],
[ac_have_vlan_flag_loose_binding=yes],
[ac_have_vlan_flag_loose_binding=no])
AC_MSG_RESULT($ac_have_vlan_flag_loose_binding)
if test "$ac_have_vlan_flag_loose_binding" = yes; then
AC_DEFINE(HAVE_VLAN_FLAG_LOOSE_BINDING, 1, [Define if you have VLAN_FLAG_LOOSE_BINDING])
else
AC_DEFINE(HAVE_VLAN_FLAG_LOOSE_BINDING, 0, [Define if you have VLAN_FLAG_LOOSE_BINDING])
fi
dnl dnl
dnl Checks for libdl - on certain platforms its part of libc dnl Checks for libdl - on certain platforms its part of libc
dnl dnl

15
meson.build
View File

@@ -326,21 +326,6 @@ if enable_wext
endif endif
config_h.set10('HAVE_WEXT', enable_wext) config_h.set10('HAVE_WEXT', enable_wext)
# FIXME: it's not used at all?
# Check for newer VLAN flags
vlan_src = '''
#ifndef __user
#define __user
#endif
#include <sys/types.h>
#include <linux/types.h>
#include <linux/if_vlan.h>
int main() {
unsigned a = VLAN_FLAG_LOOSE_BINDING;
}
'''
config_h.set('HAVE_VLAN_FLAG_LOOSE_BINDING', cc.compiles(vlan_src))
# Checks for libdl - on certain platforms its part of libc # Checks for libdl - on certain platforms its part of libc
dl_dep = cc.find_library('dl') dl_dep = cc.find_library('dl')
''' '''