From 25d5384c307e150f423ec8ddc9906b64e77d0b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Mon, 18 Dec 2017 20:32:46 +0100
Subject: [PATCH] build: Drop HAVE_VLAN_FLAG_LOOSE_BINDING

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
---
 config.h.meson |  3 ---
 configure.ac   | 22 ----------------------
 meson.build    | 15 ---------------
 3 files changed, 40 deletions(-)

diff --git a/config.h.meson b/config.h.meson
index 1e79fa50ba..67de050b0e 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -53,9 +53,6 @@
 /* Define if systemd support is available */
 #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 */
 #mesondefine HAVE_WEXT
 
diff --git a/configure.ac b/configure.ac
index 9d8f10c137..0124b58d66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -299,28 +299,6 @@ else
 fi
 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 Checks for libdl - on certain platforms its part of libc
 dnl
diff --git a/meson.build b/meson.build
index 1437526fc0..a5f71b879d 100644
--- a/meson.build
+++ b/meson.build
@@ -326,21 +326,6 @@ if enable_wext
 endif
 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
 dl_dep = cc.find_library('dl')
 '''