New upstream version 1.11.3 upstream/1.11.3

1 files changed, 574 insertions, 712 deletions

diff --git a/configure b/configure
index 1c554bee..d9c4e2f8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager 1.10.6.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.11.3.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.10.6'
-PACKAGE_STRING='NetworkManager 1.10.6'
+PACKAGE_VERSION='1.11.3'
+PACKAGE_STRING='NetworkManager 1.11.3'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -682,8 +682,12 @@ ENABLE_VAPIGEN_TRUE
 VAPIGEN_MAKEFILE
 VAPIGEN_VAPIDIR
 VAPIGEN
-SANITIZERS
+SANITIZER_LIB_LDFLAGS
+SANITIZER_EXEC_LDFLAGS
+SANITIZER_LIB_CFLAGS
+SANITIZER_EXEC_CFLAGS
 SANITIZER_ENV
+LIBSYSTEMD_NM_CFLAGS
 BUILD_NMTUI_FALSE
 BUILD_NMTUI_TRUE
 NEWT_LIBS
@@ -693,8 +697,6 @@ BUILD_NMCLI_TRUE
 READLINE_LIBS
 LIBNDP_LIBS
 LIBNDP_CFLAGS
-WITH_CONCHECK_FALSE
-WITH_CONCHECK_TRUE
 LIBCURL_LIBS
 LIBCURL_CFLAGS
 WITH_LIBPSL_FALSE
@@ -734,7 +736,6 @@ WITH_PPP_FALSE
 WITH_PPP_TRUE
 DBUS_SYS_DIR
 GLIB_MKENUMS
-GLIB_GENMARSHAL
 GLIB_MAKEFILE
 WITH_GNUTLS_FALSE
 WITH_GNUTLS_TRUE
@@ -750,20 +751,20 @@ WITH_POLKIT_AGENT_TRUE
 POLKIT_LIBS
 POLKIT_CFLAGS
 NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT
-WITH_JANSSON_FALSE
-WITH_JANSSON_TRUE
-ac_ct_READELF
-READELF
+WITH_JSON_VALIDATION_FALSE
+WITH_JSON_VALIDATION_TRUE
 WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
 LIBTEAMDCTL_LIBS
 LIBTEAMDCTL_CFLAGS
+WITH_JANSSON_FALSE
+WITH_JANSSON_TRUE
+ac_ct_READELF
+READELF
 JANSSON_LIBS
 JANSSON_CFLAGS
 UUID_LIBS
 UUID_CFLAGS
-LIBNL_LIBS
-LIBNL_CFLAGS
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT
 LIBAUDIT_LIBS
 LIBAUDIT_CFLAGS
@@ -795,6 +796,15 @@ WITH_QT_TRUE
 MOC
 QT_LIBS
 QT_CFLAGS
+LIBUDEV_LIBS
+LIBUDEV_CFLAGS
+WITH_FAKE_TYPELIBS_FALSE
+WITH_FAKE_TYPELIBS_TRUE
+WITH_LEGACY_LIBRARIES_FALSE
+WITH_LEGACY_LIBRARIES_TRUE
+GLIB_COMPILE_RESOURCES
+DBUS_LIBS
+DBUS_CFLAGS
 HAVE_INTROSPECTION_FALSE
 HAVE_INTROSPECTION_TRUE
 INTROSPECTION_MAKEFILE
@@ -805,12 +815,6 @@ INTROSPECTION_GIRDIR
 INTROSPECTION_GENERATE
 INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
-LIBUDEV_LIBS
-LIBUDEV_CFLAGS
-WITH_LEGACY_LIBRARIES_FALSE
-WITH_LEGACY_LIBRARIES_TRUE
-DBUS_LIBS
-DBUS_CFLAGS
 AM_TESTS_FD_REDIRECT
 LOG_DRIVER
 GLIB_LIBS
@@ -819,6 +823,8 @@ PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 DL_LIBS
+WITH_IWD_FALSE
+WITH_IWD_TRUE
 WITH_WEXT_FALSE
 WITH_WEXT_TRUE
 WITH_WIFI_FALSE
@@ -832,8 +838,6 @@ CODE_COVERAGE_ENABLED
 CODE_COVERAGE_ENABLED_FALSE
 CODE_COVERAGE_ENABLED_TRUE
 DISTRO_NETWORK_SERVICE
-CONFIG_PLUGIN_IFNET_FALSE
-CONFIG_PLUGIN_IFNET_TRUE
 CONFIG_PLUGIN_IFUPDOWN_FALSE
 CONFIG_PLUGIN_IFUPDOWN_TRUE
 CONFIG_PLUGIN_IFCFG_RH_FALSE
@@ -1044,16 +1048,15 @@ with_libiconv_prefix
 with_libintl_prefix
 enable_config_plugin_ibft
 enable_ifcfg_rh
-enable_ifcfg_suse
 enable_ifupdown
-enable_ifnet
 with_config_plugins_default
 enable_code_coverage
 with_dist_version
 enable_wifi
 with_wext
-with_libnm_glib
+with_iwd
 enable_introspection
+with_libnm_glib
 enable_qt
 with_udev_dir
 with_systemdsystemunitdir
@@ -1103,7 +1106,7 @@ with_more_asserts
 enable_more_logging
 enable_lto
 enable_ld_gc
-enable_address_sanitizer
+with_address_sanitizer
 enable_undefined_sanitizer
 enable_vala
 enable_tests
@@ -1156,8 +1159,6 @@ SELINUX_CFLAGS
 SELINUX_LIBS
 LIBAUDIT_CFLAGS
 LIBAUDIT_LIBS
-LIBNL_CFLAGS
-LIBNL_LIBS
 UUID_CFLAGS
 UUID_LIBS
 JANSSON_CFLAGS
@@ -1725,7 +1726,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 1.10.6 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.11.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1795,7 +1796,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.10.6:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.11.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1822,10 +1823,7 @@ Optional Features:
   --enable-config-plugin-ibft
                           enable ibft configuration plugin
   --enable-ifcfg-rh       enable ifcfg-rh configuration plugin (Fedora/RHEL)
-  --enable-ifcfg-suse     enable ifcfg-suse configuration plugin (SUSE)
-                          (deprecated)
   --enable-ifupdown       enable ifupdown configuration plugin (Debian/Ubuntu)
-  --enable-ifnet          enable ifnet configuration plugin (Gentoo)
   --enable-code-coverage  Whether to enable code coverage support
   --enable-wifi           enable Wi-Fi support
   --enable-introspection=[no/auto/yes]
@@ -1834,11 +1832,9 @@ Optional Features:
   --enable-teamdctl       enable Teamd control support
   --enable-json-validation
                           Enable JSON validation in libnm
-  --enable-polkit=yes|no|disabled
-                          set default value for auth-polkit configuration
+  --enable-polkit=yes|no  set default value for auth-polkit configuration
                           option. This value can be overwritten by NM
-                          configuration. 'disabled' compiles NM without any
-                          support
+                          configuration. 'disabled' is an alias for 'no'
   --enable-polkit-agent   enable polkit agent for clients
   --enable-modify-system  Allow users to modify system connections
   --enable-ppp            enable PPP/PPPoE support
@@ -1854,8 +1850,6 @@ Optional Features:
                           (default: no)
   --enable-ld-gc          Enable garbage collection of unused symbols on
                           linking (default: auto)
-  --enable-address-sanitizer
-                          Compile with address sanitizer (default: no)
   --enable-undefined-sanitizer
                           Compile with undefined behavior sanitizer (default:
                           no)
@@ -1890,7 +1884,9 @@ Optional Packages:
   --with-dist-version=<NM-distribution-version>
                           Define the NM''s distribution version string
   --with-wext=yes         Enable or disable Linux Wireless Extensions
-  --without-libnm-glib    don't build legacy libraries
+  --with-iwd=yes          Support IWD as wifi-backend in addition to
+                          wpa_supplicant (experimental)
+  --without-libnm-glib    don"'"t build legacy libraries
   --with-udev-dir=DIR     Absolute path of the udev base directory. Set to
                           'no' not to install the udev rules
   --with-systemdsystemunitdir=DIR
@@ -1962,6 +1958,8 @@ Optional Packages:
   --with-more-asserts=level
                           Enable more assertions for debugging (0 = none, 100
                           = all, default: auto)
+  --with-address-sanitizer=yes|no|exec
+                          Enable address sanitizer (default: no)
   --with-valgrind=yes|no|path
                           Use valgrind to memory-check the tests (default: no)
   --with-tests            Build NetworkManager tests (deprecated)
@@ -2030,9 +2028,6 @@ Some influential environment variables:
               C compiler flags for LIBAUDIT, overriding pkg-config
   LIBAUDIT_LIBS
               linker flags for LIBAUDIT, overriding pkg-config
-  LIBNL_CFLAGS
-              C compiler flags for LIBNL, overriding pkg-config
-  LIBNL_LIBS  linker flags for LIBNL, overriding pkg-config
   UUID_CFLAGS C compiler flags for UUID, overriding pkg-config
   UUID_LIBS   linker flags for UUID, overriding pkg-config
   JANSSON_CFLAGS
@@ -2142,7 +2137,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.10.6
+NetworkManager configure 1.11.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2915,7 +2910,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 1.10.6, which was
+It was created by NetworkManager $as_me 1.11.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3785,7 +3780,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.10.6'
+ VERSION='1.11.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17968,9 +17963,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=10
-NM_MICRO_VERSION=6
-NM_VERSION=1.10.6
+NM_MINOR_VERSION=11
+NM_MICRO_VERSION=3
+NM_VERSION=1.11.3
 
 
 
@@ -17978,7 +17973,7 @@ NM_VERSION=1.10.6
 
 
 
-NM_GIT_SHA=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712
+NM_GIT_SHA=5d5b9d7ce0fc314165cb9ffccedbb7c05a1f30b5
 
 if test """" != "no-config-h" ; then
 
@@ -18066,6 +18061,39 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5
+$as_echo_n "checking size of pid_t... " >&6; }
+if ${ac_cv_sizeof_pid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_pid_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (pid_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_pid_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5
+$as_echo "$ac_cv_sizeof_pid_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_PID_T $ac_cv_sizeof_pid_t
+_ACEOF
+
+
 
 ac_fn_c_check_decl "$LINENO" "explicit_bzero" "ac_cv_have_decl_explicit_bzero" "
 #include <string.h>
@@ -18082,6 +18110,21 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+ac_fn_c_check_decl "$LINENO" "reallocarray" "ac_cv_have_decl_reallocarray" "
+#include <malloc.h>
+
+"
+if test "x$ac_cv_have_decl_reallocarray" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_REALLOCARRAY $ac_have_decl
+_ACEOF
+
+
 for ac_header in sys/auxv.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default"
@@ -20865,106 +20908,33 @@ if test "${enable_ifcfg_rh+set}" = set; then :
   enableval=$enable_ifcfg_rh;
 fi
 
-# Check whether --enable-ifcfg-suse was given.
-if test "${enable_ifcfg_suse+set}" = set; then :
-  enableval=$enable_ifcfg_suse;
-fi
-
 # Check whether --enable-ifupdown was given.
 if test "${enable_ifupdown+set}" = set; then :
   enableval=$enable_ifupdown;
 fi
 
-# Check whether --enable-ifnet was given.
-if test "${enable_ifnet+set}" = set; then :
-  enableval=$enable_ifnet;
-fi
-
 # Default alternative plugins by distribution
 if test -z "$enable_ifcfg_rh"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5
-$as_echo_n "checking for /etc/redhat-release... " >&6; }
-if ${ac_cv_file__etc_redhat_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/redhat-release"; then
-  ac_cv_file__etc_redhat_release=yes
-else
-  ac_cv_file__etc_redhat_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_redhat_release" >&5
-$as_echo "$ac_cv_file__etc_redhat_release" >&6; }
-if test "x$ac_cv_file__etc_redhat_release" = xyes; then :
-  enable_ifcfg_rh=yes
-fi
-
-fi
-if test -z "$enable_ifcfg_rh"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/fedora-release" >&5
-$as_echo_n "checking for /etc/fedora-release... " >&6; }
-if ${ac_cv_file__etc_fedora_release+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/sysconfig/network-scripts" >&5
+$as_echo_n "checking for /etc/sysconfig/network-scripts... " >&6; }
+if ${ac_cv_file__etc_sysconfig_network_scripts+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/fedora-release"; then
-  ac_cv_file__etc_fedora_release=yes
+if test -r "/etc/sysconfig/network-scripts"; then
+  ac_cv_file__etc_sysconfig_network_scripts=yes
 else
-  ac_cv_file__etc_fedora_release=no
+  ac_cv_file__etc_sysconfig_network_scripts=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_fedora_release" >&5
-$as_echo "$ac_cv_file__etc_fedora_release" >&6; }
-if test "x$ac_cv_file__etc_fedora_release" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_sysconfig_network_scripts" >&5
+$as_echo "$ac_cv_file__etc_sysconfig_network_scripts" >&6; }
+if test "x$ac_cv_file__etc_sysconfig_network_scripts" = xyes; then :
   enable_ifcfg_rh=yes
 fi
 
 fi
-if test -z "$enable_ifcfg_rh"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandriva-release" >&5
-$as_echo_n "checking for /etc/mandriva-release... " >&6; }
-if ${ac_cv_file__etc_mandriva_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/mandriva-release"; then
-  ac_cv_file__etc_mandriva_release=yes
-else
-  ac_cv_file__etc_mandriva_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_mandriva_release" >&5
-$as_echo "$ac_cv_file__etc_mandriva_release" >&6; }
-if test "x$ac_cv_file__etc_mandriva_release" = xyes; then :
-  enable_ifcfg_rh=yes
-fi
-
-fi
-if test -z "$enable_ifcfg_suse"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5
-$as_echo_n "checking for /etc/SuSE-release... " >&6; }
-if ${ac_cv_file__etc_SuSE_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/SuSE-release"; then
-  ac_cv_file__etc_SuSE_release=yes
-else
-  ac_cv_file__etc_SuSE_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5
-$as_echo "$ac_cv_file__etc_SuSE_release" >&6; }
-if test "x$ac_cv_file__etc_SuSE_release" = xyes; then :
-  enable_ifcfg_suse=yes
-fi
-
-fi
 if test -z "$enable_ifupdown"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5
 $as_echo_n "checking for /etc/debian_version... " >&6; }
@@ -20986,40 +20956,13 @@ if test "x$ac_cv_file__etc_debian_version" = xyes; then :
 fi
 
 fi
-if test -z "$enable_ifnet"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/gentoo-release" >&5
-$as_echo_n "checking for /etc/gentoo-release... " >&6; }
-if ${ac_cv_file__etc_gentoo_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/gentoo-release"; then
-  ac_cv_file__etc_gentoo_release=yes
-else
-  ac_cv_file__etc_gentoo_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_gentoo_release" >&5
-$as_echo "$ac_cv_file__etc_gentoo_release" >&6; }
-if test "x$ac_cv_file__etc_gentoo_release" = xyes; then :
-  enable_ifnet=yes
-fi
-
-fi
 # Otherwise plugins default to "no"
 if test -z "$enable_ifcfg_rh"; then :
   enable_ifcfg_rh=no
 fi
-if test -z "$enable_ifcfg_suse"; then :
-  enable_ifcfg_suse=no
-fi
 if test -z "$enable_ifupdown"; then :
   enable_ifupdown=no
 fi
-if test -z "$enable_ifnet"; then :
-  enable_ifnet=no
-fi
 # Enable ibft by default
 if test -z "$enable_config_plugin_ibft"; then :
   enable_config_plugin_ibft="yes"
@@ -21049,14 +20992,6 @@ else
   CONFIG_PLUGIN_IFUPDOWN_FALSE=
 fi
 
- if test "$enable_ifnet" = "yes"; then
-  CONFIG_PLUGIN_IFNET_TRUE=
-  CONFIG_PLUGIN_IFNET_FALSE='#'
-else
-  CONFIG_PLUGIN_IFNET_TRUE='#'
-  CONFIG_PLUGIN_IFNET_FALSE=
-fi
-
 
 
 # Check whether --with-config-plugins-default was given.
@@ -21070,15 +21005,12 @@ if test -z "$config_plugins_default" -o "$config_plugins_default" = no; then
 	config_plugins_default=''
 	test "$enable_ifcfg_rh" = "yes"           && config_plugins_default="$config_plugins_default,ifcfg-rh"
 	test "$enable_ifupdown" = "yes"           && config_plugins_default="$config_plugins_default,ifupdown"
-	test "$enable_ifnet" = "yes"              && config_plugins_default="$config_plugins_default,ifnet"
 	test "$enable_config_plugin_ibft" = "yes" && config_plugins_default="$config_plugins_default,ibft"
 	config_plugins_default="${config_plugins_default#,}"
 fi
 
 test "$enable_ifcfg_rh" = "yes"           && distro_plugins="$distro_plugins,ifcfg-rh"
-test "$enable_ifcfg_suse" = "yes"         && distro_plugins="$distro_plugins,ifcfg-suse"
 test "$enable_ifupdown" = "yes"           && distro_plugins="$distro_plugins,ifupdown"
-test "$enable_ifnet" = "yes"              && distro_plugins="$distro_plugins,ifnet"
 distro_plugins="${distro_plugins#,}"
 
 
@@ -21362,38 +21294,6 @@ if test x"$ac_with_wext" = x"yes"; then
 	if test "$enable_wifi" != "yes"; then
 		as_fn_error $? "Enabling WEXT support and disabling Wi-Fi makes no sense" "$LINENO" 5
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel WEXT headers" >&5
-$as_echo_n "checking Linux kernel WEXT headers... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __user
-	                                     #define __user
-	                                     #endif
-	                                     #include <sys/types.h>
-	                                     #include <linux/types.h>
-	                                     #include <sys/socket.h>
-	                                     #include <linux/wireless.h>
-int
-main ()
-{
-#ifndef IWEVGENIE
-	                                     #error "not found"
-	                                     #endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_have_iwevgenie=yes
-else
-  ac_have_iwevgenie=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_iwevgenie" >&5
-$as_echo "$ac_have_iwevgenie" >&6; }
-	if test "$ac_have_iwevgenie" = no; then
-		as_fn_error $? "Linux kernel development header linux/wireless.h not installed or not functional" "$LINENO" 5
-	fi
 
 $as_echo "#define HAVE_WEXT 1" >>confdefs.h
 
@@ -21411,113 +21311,37 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 headers" >&5
-$as_echo_n "checking Linux kernel nl80211 headers... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#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++;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_have_nl80211=yes
-else
-  ac_have_nl80211=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211" >&5
-$as_echo "$ac_have_nl80211" >&6; }
-if test "$ac_have_nl80211" = no; then
-	as_fn_error $? "Linux kernel development header linux/nl80211.h not installed or not functional" "$LINENO" 5
-fi
 
-if test "$with_wifi" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 Critical Protocol Start/Stop" >&5
-$as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __user
-	                                     #define __user
-	                                     #endif
-	                                     #include <sys/types.h>
-	                                     #include <linux/types.h>
-	                                     #include <sys/socket.h>
-	                                     #include <linux/nl80211.h>
-int
-main ()
-{
-unsigned a = NL80211_CMD_CRIT_PROTOCOL_START; a++;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_have_nl80211_critproto=yes
+# Check whether --with-iwd was given.
+if test "${with_iwd+set}" = set; then :
+  withval=$with_iwd; ac_with_iwd=$withval
 else
-  ac_have_nl80211_critproto=no
+  ac_with_iwd="no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211_critproto" >&5
-$as_echo "$ac_have_nl80211_critproto" >&6; }
-else
-	ac_have_nl80211_critproto='no'
+
+if test "$ac_with_iwd" != 'no'; then
+	ac_with_iwd='yes'
 fi
-if test "$ac_have_nl80211_critproto" = yes; then
+if test x"$ac_with_iwd" = x"yes"; then
+	if test "$enable_wifi" != "yes"; then
+		as_fn_error $? "Enabling IWD support and disabling Wi-Fi makes no sense" "$LINENO" 5
+	fi
 
-$as_echo "#define HAVE_NL80211_CRITICAL_PROTOCOL_CMDS 1" >>confdefs.h
+$as_echo "#define WITH_IWD 1" >>confdefs.h
 
 else
 
-$as_echo "#define HAVE_NL80211_CRITICAL_PROTOCOL_CMDS 0" >>confdefs.h
+$as_echo "#define WITH_IWD 0" >>confdefs.h
 
 fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value" >&5
-$as_echo_n "checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#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;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_have_vlan_flag_loose_binding=yes
+ if test x"${ac_with_iwd}" = x"yes"; then
+  WITH_IWD_TRUE=
+  WITH_IWD_FALSE='#'
 else
-  ac_have_vlan_flag_loose_binding=no
+  WITH_IWD_TRUE='#'
+  WITH_IWD_FALSE=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_vlan_flag_loose_binding" >&5
-$as_echo "$ac_have_vlan_flag_loose_binding" >&6; }
-if test "$ac_have_vlan_flag_loose_binding" = yes; then
-
-$as_echo "#define HAVE_VLAN_FLAG_LOOSE_BINDING 1" >>confdefs.h
-
-else
-
-$as_echo "#define HAVE_VLAN_FLAG_LOOSE_BINDING 0" >>confdefs.h
 
-fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
@@ -21768,12 +21592,12 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21785,12 +21609,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21811,14 +21635,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.32 gmodule-2.0) were not met:
+	as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.40 gmodule-2.0) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -21864,12 +21688,12 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21881,12 +21705,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21907,14 +21731,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.32 gmodule-2.0) were not met:
+	as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.40 gmodule-2.0) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -21959,7 +21783,103 @@ $as_echo "yes" >&6; }
 
 fi
 
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40"
+
+
+
+
+
+
+
+                # Check whether --enable-introspection was given.
+if test "${enable_introspection+set}" = set; then :
+  enableval=$enable_introspection;
+else
+  enable_introspection=auto
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
+$as_echo_n "checking for gobject-introspection... " >&6; }
+
+        case $enable_introspection in #(
+  no) :
+            found_introspection="no (disabled, use --enable-introspection to enable)"
+     ;; #(
+      yes) :
+            if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  :
+else
+  as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+fi
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  found_introspection=yes
+else
+  as_fn_error $? "You need to have gobject-introspection >= 0.9.6 installed to build NetworkManager" "$LINENO" 5
+fi
+     ;; #(
+      auto) :
+            if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  found_introspection=yes
+else
+  found_introspection=no
+fi
+		enable_introspection=$found_introspection
+     ;; #(
+  *) :
+                as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+     ;;
+esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+$as_echo "$found_introspection" >&6; }
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+    INTROSPECTION_SCANNER='CFLAGS="${CFLAGS} -Wno-error" '"$INTROSPECTION_SCANNER"
+
+
+
+
+
+
+
+
+
+     if test "x$found_introspection" = "xyes"; then
+  HAVE_INTROSPECTION_TRUE=
+  HAVE_INTROSPECTION_FALSE='#'
+else
+  HAVE_INTROSPECTION_TRUE='#'
+  HAVE_INTROSPECTION_FALSE=
+fi
 
 
 
@@ -21970,6 +21890,7 @@ if test "${with_libnm_glib+set}" = set; then :
   withval=$with_libnm_glib;
 fi
 
+fake_typelibs=no
 if test "$with_libnm_glib" != "no"; then
 
 pkg_failed=no
@@ -22056,6 +21977,52 @@ $as_echo "yes" >&6; }
 fi
 
 	with_libnm_glib=yes
+
+	if test "${found_introspection}" = "yes"; then
+		# Extract the first word of "glib-compile-resources", so it can be a program name with args.
+set dummy glib-compile-resources; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GLIB_COMPILE_RESOURCES in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES
+if test -n "$GLIB_COMPILE_RESOURCES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5
+$as_echo "$GLIB_COMPILE_RESOURCES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then
+			fake_typelibs=yes
+		fi
+	fi
 fi
  if test "$with_libnm_glib" != "no"; then
   WITH_LEGACY_LIBRARIES_TRUE=
@@ -22065,6 +22032,23 @@ else
   WITH_LEGACY_LIBRARIES_FALSE=
 fi
 
+if test "$fake_typelibs" = "yes"; then
+
+$as_echo "#define WITH_FAKE_TYPELIBS 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_FAKE_TYPELIBS 0" >>confdefs.h
+
+fi
+ if test "${fake_typelibs}" = "yes"; then
+  WITH_FAKE_TYPELIBS_TRUE=
+  WITH_FAKE_TYPELIBS_FALSE='#'
+else
+  WITH_FAKE_TYPELIBS_TRUE='#'
+  WITH_FAKE_TYPELIBS_FALSE=
+fi
+
 
 
 pkg_failed=no
@@ -22158,102 +22142,6 @@ $as_echo "yes" >&6; }
 
 fi
 
-
-
-
-                # Check whether --enable-introspection was given.
-if test "${enable_introspection+set}" = set; then :
-  enableval=$enable_introspection;
-else
-  enable_introspection=auto
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
-$as_echo_n "checking for gobject-introspection... " >&6; }
-
-        case $enable_introspection in #(
-  no) :
-            found_introspection="no (disabled, use --enable-introspection to enable)"
-     ;; #(
-      yes) :
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
-else
-  as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
-fi
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  found_introspection=yes
-else
-  as_fn_error $? "You need to have gobject-introspection >= 0.9.6 installed to build NetworkManager" "$LINENO" 5
-fi
-     ;; #(
-      auto) :
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  found_introspection=yes
-else
-  found_introspection=no
-fi
-		enable_introspection=$found_introspection
-     ;; #(
-  *) :
-                as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
-     ;;
-esac
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
-$as_echo "$found_introspection" >&6; }
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    INTROSPECTION_SCANNER='CFLAGS="${CFLAGS} -Wno-error" '"$INTROSPECTION_SCANNER"
-
-
-
-
-
-
-
-
-
-     if test "x$found_introspection" = "xyes"; then
-  HAVE_INTROSPECTION_TRUE=
-  HAVE_INTROSPECTION_FALSE='#'
-else
-  HAVE_INTROSPECTION_TRUE='#'
-  HAVE_INTROSPECTION_FALSE=
-fi
-
-
-
-
 # Qt4
 
 pkg_failed=no
@@ -22555,10 +22443,10 @@ if test "$with_hostname_persist" = "default"; then :
   hostname_persist=default
 fi
 # if the method was not explicitly set, try to guess it from the enabled plugins
-if test -z "$hostname_persist" -a "$distro_plugins" = "ifcfg-suse"; then :
+if test -z "$hostname_persist" -a -f /etc/SuSE-release; then :
   hostname_persist=suse
 fi
-if test -z "$hostname_persist" -a "$distro_plugins" = "ifnet"; then :
+if test -z "$hostname_persist" -a -f /etc/gentoo-release; then :
   hostname_persist=gentoo
 fi
 if test -z "$hostname_persist" -a -f /etc/slackware-version; then :
@@ -24247,99 +24135,6 @@ $as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h
 fi
 
 
-# libnl support for the linux platform
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL" >&5
-$as_echo_n "checking for LIBNL... " >&6; }
-
-if test -n "$LIBNL_CFLAGS"; then
-    pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.8\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 >= 3.2.8" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBNL_LIBS"; then
-    pkg_cv_LIBNL_LIBS="$LIBNL_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.8\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-3.0 >= 3.2.8" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-3.0 >= 3.2.8" 2>&1`
-        else
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-3.0 >= 3.2.8" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libnl-3.0 >= 3.2.8) were not met:
-
-$LIBNL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBNL_CFLAGS
-and LIBNL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBNL_CFLAGS
-and LIBNL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS
-	LIBNL_LIBS=$pkg_cv_LIBNL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
 # uuid library
 
 pkg_failed=no
@@ -24444,12 +24239,12 @@ if test -n "$JANSSON_CFLAGS"; then
     pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "jansson >= 2.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null`
+  pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson >= 2.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24461,12 +24256,12 @@ if test -n "$JANSSON_LIBS"; then
     pkg_cv_JANSSON_LIBS="$JANSSON_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "jansson >= 2.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null`
+  pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson >= 2.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24487,9 +24282,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1`
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
         else
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1`
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JANSSON_PKG_ERRORS" >&5
@@ -24506,6 +24301,136 @@ else
 $as_echo "yes" >&6; }
 	have_jansson=yes
 fi
+if test "$have_jansson" = "yes"; then
+
+$as_echo "#define WITH_JANSSON 1" >>confdefs.h
+
+
+	if test -n "$ac_tool_prefix"; then
+  for ac_prog in eu-readelf readelf
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_READELF+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$READELF"; then
+  ac_cv_prog_READELF="$READELF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_READELF="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+READELF=$ac_cv_prog_READELF
+if test -n "$READELF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
+$as_echo "$READELF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$READELF" && break
+  done
+fi
+if test -z "$READELF"; then
+  ac_ct_READELF=$READELF
+  for ac_prog in eu-readelf readelf
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_READELF+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_READELF"; then
+  ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_READELF="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
+if test -n "$ac_ct_READELF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5
+$as_echo "$ac_ct_READELF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_READELF" && break
+done
+
+  if test "x$ac_ct_READELF" = x; then
+    READELF=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    READELF=$ac_ct_READELF
+  fi
+fi
+
+	JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson`
+	JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[\([^]]*\)]/\1/p'`
+
+	if test "$JANSSON_SONAME" = ""; then
+		as_fn_error $? "Unable to locate the Jansson library" "$LINENO" 5
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define JANSSON_SONAME "$JANSSON_SONAME"
+_ACEOF
+
+else
+
+$as_echo "#define WITH_JANSSON 0" >>confdefs.h
+
+fi
+ if test "${have_jansson}" = "yes"; then
+  WITH_JANSSON_TRUE=
+  WITH_JANSSON_FALSE='#'
+else
+  WITH_JANSSON_TRUE='#'
+  WITH_JANSSON_FALSE=
+fi
+
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5
@@ -24626,143 +24551,28 @@ fi
 
 if (test "${enable_json_validation}" == "no"); then
 
-$as_echo "#define WITH_JANSSON 0" >>confdefs.h
+$as_echo "#define WITH_JSON_VALIDATION 0" >>confdefs.h
 
 else
 	if test "$have_jansson" = "no"; then
 		as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5
 	fi
 
-
-$as_echo "#define WITH_JANSSON 1" >>confdefs.h
-
-
-	if test -n "$ac_tool_prefix"; then
-  for ac_prog in eu-readelf readelf
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_READELF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF"; then
-  ac_cv_prog_READELF="$READELF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_READELF="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF=$ac_cv_prog_READELF
-if test -n "$READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$READELF" && break
-  done
-fi
-if test -z "$READELF"; then
-  ac_ct_READELF=$READELF
-  for ac_prog in eu-readelf readelf
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_READELF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_READELF"; then
-  ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_READELF="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
-if test -n "$ac_ct_READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5
-$as_echo "$ac_ct_READELF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_READELF" && break
-done
-
-  if test "x$ac_ct_READELF" = x; then
-    READELF=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    READELF=$ac_ct_READELF
-  fi
-fi
-
-	JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson`
-	JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[\([^]]*\)]/\1/p'`
-
-	if test "$JANSSON_SONAME" = ""; then
-		as_fn_error $? "Unable to locate the Jansson library" "$LINENO" 5
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define JANSSON_SONAME "$JANSSON_SONAME"
-_ACEOF
+$as_echo "#define WITH_JSON_VALIDATION 1" >>confdefs.h
 
 fi
  if test "${enable_json_validation}" != "no"; then
-  WITH_JANSSON_TRUE=
-  WITH_JANSSON_FALSE='#'
+  WITH_JSON_VALIDATION_TRUE=
+  WITH_JSON_VALIDATION_FALSE='#'
 else
-  WITH_JANSSON_TRUE='#'
-  WITH_JANSSON_FALSE=
+  WITH_JSON_VALIDATION_TRUE='#'
+  WITH_JSON_VALIDATION_FALSE=
 fi
 
 
 # we usually compile with polkit support. --enable-polkit=yes|no only sets the
 # default configuration for main.auth-polkit. User can always enable/disable polkit
-# autorization via config. Only when specifying --enable-polkit=disabled, we do
-# not compile support. In this case, the user cannot enable polkit authorization via
-# configuration.
+# autorization via config.
 # Check whether --enable-polkit was given.
 if test "${enable_polkit+set}" = set; then :
   enableval=$enable_polkit; enable_polkit=${enableval}
@@ -24771,28 +24581,20 @@ else
 fi
 
 if (test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled"); then
-	enable_polkit=yes
+	enable_polkit=true
 
 $as_echo "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"true\"" >>confdefs.h
 
 	NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT=true
 
 else
+	enable_polkit=false
 
 $as_echo "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"false\"" >>confdefs.h
 
 	NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT=false
 
 fi
-if (test "${enable_polkit}" != "disabled"); then
-
-$as_echo "#define WITH_POLKIT 1" >>confdefs.h
-
-else
-
-$as_echo "#define WITH_POLKIT 0" >>confdefs.h
-
-fi
 
 
 pkg_failed=no
@@ -25142,8 +24944,6 @@ fi
 
 GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
 
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 
 
@@ -26438,14 +26238,6 @@ else
 $as_echo "#define WITH_CONCHECK 0" >>confdefs.h
 
 fi
- if test "${enable_concheck}" = "yes"; then
-  WITH_CONCHECK_TRUE=
-  WITH_CONCHECK_FALSE='#'
-else
-  WITH_CONCHECK_TRUE='#'
-  WITH_CONCHECK_FALSE=
-fi
-
 
 
 pkg_failed=no
@@ -26847,7 +26639,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 $as_echo "yes" >&6; }
 
 			CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Qunused-arguments"
+	eval "CFLAGS='$CFLAGS -Qunused-arguments'"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -26855,7 +26647,7 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
-  CFLAGS="$CFLAGS_SAVED"
+  eval "CFLAGS='$CFLAGS_SAVED'"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	unset CFLAGS_SAVED
@@ -26882,14 +26674,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wunknown-warning-option"
+			eval "CFLAGS='$CFLAGS -Wunknown-warning-option'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-unknown-warning-option"
+			eval "CFLAGS='$CFLAGS -Wno-unknown-warning-option'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26929,13 +26721,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		      -Wshift-negative-value \
 		      -Wstrict-prototypes \
 		      -Wundef \
+		      -Wvla \
 		      -Wno-duplicate-decl-specifier \
 		      -Wno-format-truncation \
 		      -Wno-format-y2k \
 		      -Wno-missing-field-initializers \
 		      -Wno-pragmas \
 		      -Wno-sign-compare \
-		      -Wno-unused-but-set-variable \
 		      -Wno-unused-parameter \
 		      ; do
 
@@ -27006,14 +26798,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wunknown-attributes"
+			eval "CFLAGS='$CFLAGS -Wunknown-attributes'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-unknown-attributes"
+			eval "CFLAGS='$CFLAGS -Wno-unknown-attributes'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27051,14 +26843,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wtypedef-redefinition"
+			eval "CFLAGS='$CFLAGS -Wtypedef-redefinition'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-typedef-redefinition"
+			eval "CFLAGS='$CFLAGS -Wno-typedef-redefinition'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27098,14 +26890,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Warray-bounds"
+			eval "CFLAGS='$CFLAGS -Warray-bounds'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-array-bounds"
+			eval "CFLAGS='$CFLAGS -Wno-array-bounds'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27145,14 +26937,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wparentheses-equality"
+			eval "CFLAGS='$CFLAGS -Wparentheses-equality'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-parentheses-equality"
+			eval "CFLAGS='$CFLAGS -Wno-parentheses-equality'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27192,14 +26984,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wunused-value"
+			eval "CFLAGS='$CFLAGS -Wunused-value'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-unused-value"
+			eval "CFLAGS='$CFLAGS -Wno-unused-value'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27238,14 +27030,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wmissing-braces"
+			eval "CFLAGS='$CFLAGS -Wmissing-braces'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-missing-braces"
+			eval "CFLAGS='$CFLAGS -Wno-missing-braces'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27289,14 +27081,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wcast-function-type"
+			eval "CFLAGS='$CFLAGS -Wcast-function-type'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			CFLAGS="$CFLAGS -Wno-cast-function-type"
+			eval "CFLAGS='$CFLAGS -Wno-cast-function-type'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -27312,7 +27104,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
+	eval "CFLAGS='$CFLAGS_MORE_WARNINGS $CFLAGS'"
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -27320,6 +27112,55 @@ fi
 
 
 
+
+	CFLAGS_SAVED="$CFLAGS"
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror "-Wno-gnu-variable-sized-type-not-at-end""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \"-Wno-gnu-variable-sized-type-not-at-end\" works as expected" >&5
+$as_echo_n "checking whether \"-Wno-gnu-variable-sized-type-not-at-end\" works as expected... " >&6; }
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+
+		eval "LIBSYSTEMD_NM_CFLAGS='$LIBSYSTEMD_NM_CFLAGS "-Wno-gnu-variable-sized-type-not-at-end"'"
+
+
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
+$as_echo "not supported" >&6; }
+		CFLAGS="$CFLAGS_SAVED"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+
+
   for flag in \
 	-fno-strict-aliasing \
 ; do
@@ -27490,12 +27331,13 @@ fi
 fi
 
 
-# Check whether --enable-address-sanitizer was given.
-if test "${enable_address_sanitizer+set}" = set; then :
-  enableval=$enable_address_sanitizer;
+
+# Check whether --with-address-sanitizer was given.
+if test "${with_address_sanitizer+set}" = set; then :
+  withval=$with_address_sanitizer;
 fi
 
-if (test "${enable_address_sanitizer}" = "yes"); then
+if test "$with_address_sanitizer" = yes -o "$with_address_sanitizer" = "exec"; then
 
   for flag in -fsanitize=address; do
 
@@ -27533,9 +27375,20 @@ fi
   as_fn_error $? "*** -fsanitize=address is not supported" "$LINENO" 5
 fi
 
-	sanitizer_cflags="$sanitizer_cflags -fsanitize=address"
-	sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=address"
-	sanitizers="${sanitizers}asan "
+	sanitizer_exec_cflags="$sanitizer_exec_cflags -fsanitize=address"
+	sanitizer_exec_ldflags="$sanitizer_exec_ldflags -Wc,-fsanitize=address"
+
+$as_echo "#define ASAN_BUILD 1" >>confdefs.h
+
+
+	if test "$with_address_sanitizer" = "yes"; then
+		sanitizer_lib_cflags="$sanitizer_lib_cflags -fsanitize=address"
+		sanitizer_lib_ldflags="$sanitizer_lib_ldflags -Wc,-fsanitize=address"
+		sanitizers="${sanitizers}address "
+		asan_options="ASAN_OPTIONS=detect_leaks=0"
+	else
+		sanitizers="${sanitizers}address(executables-only) "
+	fi
 fi
 
 # Check whether --enable-undefined-sanitizer was given.
@@ -27581,21 +27434,26 @@ fi
   as_fn_error $? "*** -fsanitize=undefined is not supported" "$LINENO" 5
 fi
 
-	sanitizer_cflags="$sanitizer_cflags -fsanitize=undefined"
-	sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=undefined"
-	sanitizers="${sanitizers}ubsan "
+	sanitizer_exec_cflags="$sanitizer_exec_cflags -fsanitize=undefined"
+	sanitizer_lib_cflags="$sanitizer_lib_cflags -fsanitize=undefined"
+	sanitizer_exec_ldflags="$sanitizer_exec_ldflags -Wc,-fsanitize=undefined"
+	sanitizer_lib_ldflags="$sanitizer_lib_ldflags -Wc,-fsanitize=undefined"
+	sanitizers="${sanitizers}undefined-behavior "
 fi
 
 if test -n "$sanitizers"; then
-	CFLAGS="$CFLAGS $sanitizer_cflags -DVALGRIND=1 -fno-omit-frame-pointer"
-	LDFLAGS="$LDFLAGS $sanitizer_ldflags"
 	sanitizers="${sanitizers% }"
-	SANITIZER_ENV=ASAN_OPTIONS=detect_leaks=0
+	SANITIZER_ENV="$asan_options"
 
-fi
+	SANITIZER_EXEC_CFLAGS="$sanitizer_exec_cflags -DVALGRIND=1 -fno-omit-frame-pointer"
+
+	SANITIZER_LIB_CFLAGS="$sanitizer_lib_cflags -DVALGRIND=1 -fno-omit-frame-pointer"
 
-SANITIZERS=$sanitizers
+	SANITIZER_EXEC_LDFLAGS=$sanitizer_exec_ldflags
 
+	SANITIZER_LIB_LDFLAGS=$sanitizer_lib_ldflags
+
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking CC support C11 _Generic()" >&5
 $as_echo_n "checking CC support C11 _Generic()... " >&6; }
@@ -28894,10 +28752,6 @@ if test -z "${CONFIG_PLUGIN_IFUPDOWN_TRUE}" && test -z "${CONFIG_PLUGIN_IFUPDOWN
   as_fn_error $? "conditional \"CONFIG_PLUGIN_IFUPDOWN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${CONFIG_PLUGIN_IFNET_TRUE}" && test -z "${CONFIG_PLUGIN_IFNET_FALSE}"; then
-  as_fn_error $? "conditional \"CONFIG_PLUGIN_IFNET\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then
   as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28910,14 +28764,22 @@ if test -z "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then
   as_fn_error $? "conditional \"WITH_WEXT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_LEGACY_LIBRARIES_TRUE}" && test -z "${WITH_LEGACY_LIBRARIES_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_LEGACY_LIBRARIES\" was never defined.
+if test -z "${WITH_IWD_TRUE}" && test -z "${WITH_IWD_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_IWD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_LEGACY_LIBRARIES_TRUE}" && test -z "${WITH_LEGACY_LIBRARIES_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LEGACY_LIBRARIES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_FAKE_TYPELIBS_TRUE}" && test -z "${WITH_FAKE_TYPELIBS_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_FAKE_TYPELIBS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_QT_TRUE}" && test -z "${WITH_QT_FALSE}"; then
   as_fn_error $? "conditional \"WITH_QT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28934,12 +28796,16 @@ if test -z "${HAVE_SYSTEMD_200_TRUE}" && test -z "${HAVE_SYSTEMD_200_FALSE}"; th
   as_fn_error $? "conditional \"HAVE_SYSTEMD_200\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_JANSSON_TRUE}" && test -z "${WITH_JANSSON_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_JANSSON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_TEAMDCTL_TRUE}" && test -z "${WITH_TEAMDCTL_FALSE}"; then
   as_fn_error $? "conditional \"WITH_TEAMDCTL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_JANSSON_TRUE}" && test -z "${WITH_JANSSON_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_JANSSON\" was never defined.
+if test -z "${WITH_JSON_VALIDATION_TRUE}" && test -z "${WITH_JSON_VALIDATION_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_JSON_VALIDATION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_POLKIT_AGENT_TRUE}" && test -z "${WITH_POLKIT_AGENT_FALSE}"; then
@@ -28978,10 +28844,6 @@ if test -z "${WITH_LIBPSL_TRUE}" && test -z "${WITH_LIBPSL_FALSE}"; then
   as_fn_error $? "conditional \"WITH_LIBPSL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_CONCHECK_TRUE}" && test -z "${WITH_CONCHECK_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_CONCHECK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${BUILD_NMCLI_TRUE}" && test -z "${BUILD_NMCLI_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_NMCLI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29431,7 +29293,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 1.10.6, which was
+This file was extended by NetworkManager $as_me 1.11.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29497,7 +29359,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 1.10.6
+NetworkManager config.status 1.11.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31613,6 +31475,10 @@ echo
 echo "System paths:"
 echo "  prefix: $prefix"
 echo "  exec_prefix: $exec_prefix"
+echo "  sysconfdir: $sysconfdir"
+echo "  localstatedir: $localstatedir"
+echo "  runstatedir: $runstatedir"
+echo "  datadir: $datadir"
 echo "  systemdunitdir: $with_systemdsystemunitdir"
 echo "  nmbinary: $nmbinary"
 echo "  nmconfdir: $nmconfdir"
@@ -31625,14 +31491,10 @@ echo
 echo "Platform:"
 echo "  session tracking: $session_tracking"
 echo "  suspend/resume: $with_suspend_resume"
-if test "${enable_polkit}" = "yes"; then
-	if test "${enable_modify_system}" = "yes"; then
-		echo "  policykit: yes (permissive modify.system) (default: main.auth-polkit=${enable_polkit})"
-	else
-		echo "  policykit: yes (restrictive modify.system) (default: main.auth-polkit=${enable_polkit})"
-	fi
+if test "${enable_modify_system}" = "yes"; then
+	echo "  policykit: main.auth-polkit=${enable_polkit} (permissive modify.system)"
 else
-	echo  "  policykit: no"
+	echo "  policykit: main.auth-polkit=${enable_polkit} (restrictive modify.system)"
 fi
 echo "  polkit agent: ${enable_polkit_agent}"
 echo "  selinux: $have_selinux"
@@ -31653,13 +31515,13 @@ echo "  ovs: $enable_ovs"
 echo "  libnm-glib: $with_libnm_glib"
 echo "  nmcli: $build_nmcli"
 echo "  nmtui: $build_nmtui"
+echo "  iwd: $ac_with_iwd"
 echo
 
 echo "Configuration plugins (main.plugins=${config_plugins_default})"
 echo "  ibft: ${enable_config_plugin_ibft}"
 echo "  ifcfg-rh: ${enable_ifcfg_rh}"
 echo "  ifupdown: ${enable_ifupdown}"
-echo "  ifnet: ${enable_ifnet}"
 echo
 
 echo "Handlers for /etc/resolv.conf:"