Imported Upstream version 1.0.0upstream/1.0.0

1 files changed, 985 insertions, 82 deletions

diff --git a/configure b/configure
index 551c19556..573f3c024 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 0.9.10.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.0.
 #
 # 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='0.9.10.0'
-PACKAGE_STRING='NetworkManager 0.9.10.0'
+PACKAGE_VERSION='1.0.0'
+PACKAGE_STRING='NetworkManager 1.0.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -639,6 +639,11 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 subdirs
+SETTING_DOCS_AVAILABLE_FALSE
+SETTING_DOCS_AVAILABLE_TRUE
+BUILD_SETTING_DOCS_FALSE
+BUILD_SETTING_DOCS_TRUE
+PERL
 INSTALL_PREGEN_MANPAGES_FALSE
 INSTALL_PREGEN_MANPAGES_TRUE
 GTK_DOC_USE_REBASE_FALSE
@@ -676,6 +681,8 @@ LIBNDP_LIBS
 LIBNDP_CFLAGS
 WITH_CONCHECK_FALSE
 WITH_CONCHECK_TRUE
+WITH_LIBSOUP_FALSE
+WITH_LIBSOUP_TRUE
 LIBSOUP_LIBS
 LIBSOUP_CFLAGS
 KERNEL_FIRMWARE_DIR
@@ -688,6 +695,10 @@ DHCPCD_PATH
 DHCLIENT_PATH
 with_dhcpcd
 with_dhclient
+WITH_BLUEZ5_DUN_FALSE
+WITH_BLUEZ5_DUN_TRUE
+BLUEZ5_LIBS
+BLUEZ5_CFLAGS
 WITH_MODEM_MANAGER_1_FALSE
 WITH_MODEM_MANAGER_1_TRUE
 MM_GLIB_LIBS
@@ -713,10 +724,11 @@ GNUTLS_CFLAGS
 NSS_LIBS
 NSS_CFLAGS
 NM_MODIFY_SYSTEM_POLICY
-WITH_POLKIT_FALSE
-WITH_POLKIT_TRUE
+WITH_POLKIT_AGENT_FALSE
+WITH_POLKIT_AGENT_TRUE
 POLKIT_LIBS
 POLKIT_CFLAGS
+NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT
 WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
 LIBTEAMDCTL_LIBS
@@ -754,7 +766,9 @@ SYSTEMD_200_CFLAGS
 systemdsystemunitdir
 HAVE_SYSTEMD_FALSE
 HAVE_SYSTEMD_TRUE
-UDEV_BASE_DIR
+WITH_UDEV_DIR_FALSE
+WITH_UDEV_DIR_TRUE
+UDEV_DIR
 WITH_QT_FALSE
 WITH_QT_TRUE
 MOC
@@ -804,6 +818,8 @@ CONFIG_PLUGIN_IFCFG_SUSE_FALSE
 CONFIG_PLUGIN_IFCFG_SUSE_TRUE
 CONFIG_PLUGIN_IFCFG_RH_FALSE
 CONFIG_PLUGIN_IFCFG_RH_TRUE
+CONFIG_PLUGIN_IBFT_FALSE
+CONFIG_PLUGIN_IBFT_TRUE
 nmrundir
 nmstatedir
 nmdatadir
@@ -1001,10 +1017,12 @@ enable_nls
 enable_rpath
 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
 with_wext
@@ -1018,6 +1036,7 @@ with_selinux
 enable_wimax
 enable_teamdctl
 enable_polkit
+enable_polkit_agent
 enable_modify_system
 with_crypto
 with_dbus_sys_dir
@@ -1026,6 +1045,7 @@ with_pppd_plugin_dir
 with_pppd
 with_pppoe
 with_modem_manager_1
+enable_bluez5_dun
 with_dhclient
 with_dhcpcd
 with_resolvconf
@@ -1034,9 +1054,11 @@ with_iptables
 with_dnsmasq
 with_system_ca_path
 with_kernel_firmware_dir
+with_libsoup
 enable_concheck
 with_nmtui
 enable_more_warnings
+enable_lto
 enable_vala
 enable_tests
 with_valgrind
@@ -1096,6 +1118,8 @@ GNUTLS_CFLAGS
 GNUTLS_LIBS
 MM_GLIB_CFLAGS
 MM_GLIB_LIBS
+BLUEZ5_CFLAGS
+BLUEZ5_LIBS
 LIBSOUP_CFLAGS
 LIBSOUP_LIBS
 LIBNDP_CFLAGS
@@ -1644,7 +1668,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 0.9.10.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1714,7 +1738,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 0.9.10.0:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1738,6 +1762,8 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
+  --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)
   --enable-ifupdown       enable ifupdown configuration plugin (Debian/Ubuntu)
@@ -1748,11 +1774,19 @@ Optional Features:
   --enable-qt             enable Qt examples
   --enable-wimax          enable WiMAX support
   --enable-teamdctl       enable Teamd control support
-  --enable-polkit         enable PolicyKit support
+  --enable-polkit=yes|no|disabled
+                          set default value for auth-polkit configuration
+                          option. This value can be overwritten by NM
+                          configuration. 'disabled' compiles NM without any
+                          support
+  --enable-polkit-agent   enable polkit agent for clients
   --enable-modify-system  Allow users to modify system connections
   --enable-ppp            enable PPP/PPPoE support
+  --enable-bluez5-dun     enable Bluez5 DUN support
   --enable-concheck       enable connectivity checking support
   --enable-more-warnings  Possible values: no/yes/error
+  --enable-lto            Enable Link Time Optimization for smaller size
+                          (default: no)
   --enable-vala=[no/auto/yes]
                           build Vala bindings [[default=auto]]
   --enable-tests=root|yes|no
@@ -1774,10 +1808,15 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
+  --with-config-plugins-default=PLUGINS
+                          Default configuration option for main.plugins
+                          setting, used as fallback if the configuration
+                          option is unset
   --with-dist-version=<NM-distribution-version>
                           Define the NM''s distribution version string
   --with-wext=yes         Enable or disable Linux Wireless Extensions
-  --with-udev-dir=DIR     where the udev base directory is
+  --with-udev-dir=DIR     Absolute path of the udev base directory. Set to
+                          'no' not to install the udev rules
   --with-systemdsystemunitdir=DIR
                           Directory for systemd service files
   --with-session-tracking=systemd|consolekit|no
@@ -1815,6 +1854,7 @@ Optional Packages:
   --with-kernel-firmware-dir=DIR
                           where kernel firmware directory is (default is
                           /lib/firmware)
+  --with-libsoup=yes|no   Link against libsoup
   --with-nmtui=yes|no     Build nmtui
   --with-valgrind=yes|no|path
                           Use valgrind to memory-check the tests (default:
@@ -1893,6 +1933,9 @@ Some influential environment variables:
               C compiler flags for MM_GLIB, overriding pkg-config
   MM_GLIB_LIBS
               linker flags for MM_GLIB, overriding pkg-config
+  BLUEZ5_CFLAGS
+              C compiler flags for BLUEZ5, overriding pkg-config
+  BLUEZ5_LIBS linker flags for BLUEZ5, overriding pkg-config
   LIBSOUP_CFLAGS
               C compiler flags for LIBSOUP, overriding pkg-config
   LIBSOUP_LIBS
@@ -1973,7 +2016,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 0.9.10.0
+NetworkManager configure 1.0.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2517,7 +2560,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 0.9.10.0, which was
+It was created by NetworkManager $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3387,7 +3430,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='0.9.10.0'
+ VERSION='1.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16635,15 +16678,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-NM_MAJOR_VERSION=0
-NM_MINOR_VERSION=9
-NM_MICRO_VERSION=10
-NM_VERSION=0.9.10.0
-NM_GIT_SHA=6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
+NM_MAJOR_VERSION=1
+NM_MINOR_VERSION=0
+NM_MICRO_VERSION=0
+NM_VERSION=1.0.0
+NM_GIT_SHA=acdaf78a068b6c65ba799a7098b867953db4801c
+
+
 
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define NM_GIT_SHA "$NM_GIT_SHA"
+_ACEOF
 
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
@@ -19382,6 +19430,11 @@ nmrundir="$localstatedir/run/$PACKAGE"
 
 
 # Alternative configuration plugins
+# Check whether --enable-config-plugin-ibft was given.
+if test "${enable_config_plugin_ibft+set}" = set; then :
+  enableval=$enable_config_plugin_ibft;
+fi
+
 # Check whether --enable-ifcfg-rh was given.
 if test "${enable_ifcfg_rh+set}" = set; then :
   enableval=$enable_ifcfg_rh;
@@ -19542,7 +19595,19 @@ 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"
+fi
 # Create automake conditionals
+ if test "$enable_config_plugin_ibft" = "yes"; then
+  CONFIG_PLUGIN_IBFT_TRUE=
+  CONFIG_PLUGIN_IBFT_FALSE='#'
+else
+  CONFIG_PLUGIN_IBFT_TRUE='#'
+  CONFIG_PLUGIN_IBFT_FALSE=
+fi
+
  if test "$enable_ifcfg_rh" = "yes"; then
   CONFIG_PLUGIN_IFCFG_RH_TRUE=
   CONFIG_PLUGIN_IFCFG_RH_FALSE='#'
@@ -19576,6 +19641,29 @@ else
 fi
 
 
+
+# Check whether --with-config-plugins-default was given.
+if test "${with_config_plugins_default+set}" = set; then :
+  withval=$with_config_plugins_default; config_plugins_default="$withval"
+else
+  config_plugins_default=""
+fi
+
+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_ifcfg_suse" = "yes"         && config_plugins_default="$config_plugins_default,ifcfg-suse"
+    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
+
+cat >>confdefs.h <<_ACEOF
+#define CONFIG_PLUGINS_DEFAULT "$config_plugins_default"
+_ACEOF
+
+
 if test "$enable_ifcfg_rh" = "yes"; then
     DISTRO_NETWORK_SERVICE=network.service
 fi
@@ -20951,16 +21039,29 @@ fi
 
 
 
-
 # Check whether --with-udev-dir was given.
 if test "${with_udev_dir+set}" = set; then :
   withval=$with_udev_dir;
+else
+  with_udev_dir="yes"
 fi
 
-if test -n "$with_udev_dir" ; then
-	UDEV_BASE_DIR="$with_udev_dir"
+if (test "$with_udev_dir" != 'no'); then
+	if (test "$with_udev_dir" != 'yes' && echo -n "$with_udev_dir" | grep -v -q '^/'); then
+		as_fn_error $? "--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'" "$LINENO" 5
+	fi
+	if (test "$with_udev_dir" = 'yes'); then
+		with_udev_dir="/lib/udev"
+	fi
+	UDEV_DIR="$with_udev_dir"
+
+fi
+ if test "$with_udev_dir" != 'no'; then
+  WITH_UDEV_DIR_TRUE=
+  WITH_UDEV_DIR_FALSE='#'
 else
-	UDEV_BASE_DIR="/lib/udev"
+  WITH_UDEV_DIR_TRUE='#'
+  WITH_UDEV_DIR_FALSE=
 fi
 
 
@@ -21131,6 +21232,65 @@ if test -n "$SYSTEMD_LOGIN_CFLAGS"; then
     pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LOGIN_LIBS"; then
+    pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd" 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
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
+        else
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5
+$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; }
+
+if test -n "$SYSTEMD_LOGIN_CFLAGS"; then
+    pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
   ac_status=$?
@@ -21213,6 +21373,107 @@ else
 $as_echo "yes" >&6; }
 
 fi
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5
+$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; }
+
+if test -n "$SYSTEMD_LOGIN_CFLAGS"; then
+    pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LOGIN_LIBS"; then
+    pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 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
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1`
+        else
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libsystemd-login) were not met:
+
+$SYSTEMD_LOGIN_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 SYSTEMD_LOGIN_CFLAGS
+and SYSTEMD_LOGIN_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 SYSTEMD_LOGIN_CFLAGS
+and SYSTEMD_LOGIN_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
+	SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS
+	SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+else
+	SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS
+	SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
 
 
 fi
@@ -21231,6 +21492,14 @@ fi
 
 if test "z$with_suspend_resume" = "z"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_systemd_inhibit=yes
+else
+  if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5
   ac_status=$?
@@ -21240,6 +21509,7 @@ if test "z$with_suspend_resume" = "z"; then
 else
   have_systemd_inhibit=no
 fi
+fi
     if test "z${have_systemd_inhibit}" = "zyes"; then
 	# Use systemd if it's new enough
 	with_suspend_resume="systemd"
@@ -21261,6 +21531,159 @@ if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then
     pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_INHIBIT_LIBS"; then
+    pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 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
+	        SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
+        else
+	        SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5
+$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; }
+
+if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then
+    pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 183" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_INHIBIT_LIBS"; then
+    pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 183" 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
+	        SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1`
+        else
+	        SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libsystemd-login >= 183) were not met:
+
+$SYSTEMD_INHIBIT_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 SYSTEMD_INHIBIT_CFLAGS
+and SYSTEMD_INHIBIT_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 SYSTEMD_INHIBIT_CFLAGS
+and SYSTEMD_INHIBIT_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
+	SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS
+	SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5
+$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; }
+
+if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then
+    pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5
   ac_status=$?
@@ -21343,6 +21766,13 @@ else
 $as_echo "yes" >&6; }
 
 fi
+else
+	SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS
+	SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
         ;;
     *)
 	as_fn_error $? "--with-suspend-resume must be one of upower, systemd" "$LINENO" 5
@@ -21565,6 +21995,88 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rtnl_link_inet6_get_addr_gen_mode in -lnl-route-3" >&5
+$as_echo_n "checking for rtnl_link_inet6_get_addr_gen_mode in -lnl-route-3... " >&6; }
+if ${ac_cv_lib_nl_route_3_rtnl_link_inet6_get_addr_gen_mode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnl-route-3  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rtnl_link_inet6_get_addr_gen_mode ();
+int
+main ()
+{
+return rtnl_link_inet6_get_addr_gen_mode ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_nl_route_3_rtnl_link_inet6_get_addr_gen_mode=yes
+else
+  ac_cv_lib_nl_route_3_rtnl_link_inet6_get_addr_gen_mode=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_route_3_rtnl_link_inet6_get_addr_gen_mode" >&5
+$as_echo "$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_addr_gen_mode" >&6; }
+if test "x$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_addr_gen_mode" = xyes; then :
+  ac_have_addr_gen_mode="1"
+else
+  ac_have_addr_gen_mode="0"
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNL_INET6_ADDR_GEN_MODE $ac_have_addr_gen_mode
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel IN6_ADDR_GEN_MODE enum" >&5
+$as_echo_n "checking Linux kernel IN6_ADDR_GEN_MODE enum... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __user
+                #define __user
+                #endif
+                #include <linux/if_link.h>
+int
+main ()
+{
+int a = IN6_ADDR_GEN_MODE_EUI64; a++;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_have_kernel_gen_mode=yes
+else
+  ac_have_kernel_gen_mode=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_kernel_gen_mode" >&5
+$as_echo "$ac_have_kernel_gen_mode" >&6; }
+if test "$ac_have_kernel_gen_mode" = yes; then
+
+$as_echo "#define HAVE_KERNEL_INET6_ADDR_GEN_MODE 1" >>confdefs.h
+
+else
+
+$as_echo "#define HAVE_KERNEL_INET6_ADDR_GEN_MODE 0" >>confdefs.h
+
+fi
+
 # uuid library
 
 pkg_failed=no
@@ -21718,6 +22230,7 @@ $as_echo "$ax_cv_lib_readline" >&6; }
     as_fn_error $? "readline library with terminfo support is required (one of ncurses, curses, or termcap)" "$LINENO" 5
   fi
 
+  ORIG_LIBS="$LIBS"
   LIBS="$LIBS $ax_cv_lib_readline"
   for ac_header in readline.h readline/readline.h
 do :
@@ -21732,6 +22245,8 @@ fi
 
 done
 
+
+  # Check history
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5
 $as_echo_n "checking whether readline supports history... " >&6; }
 if ${ax_cv_lib_readline_history+:} false; then :
@@ -21782,6 +22297,47 @@ fi
 
 done
 
+
+  # check rl_echo_signal_char()
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports rl_echo_signal_char()" >&5
+$as_echo_n "checking whether readline supports rl_echo_signal_char()... " >&6; }
+if ${ax_cv_lib_readline_echo_signal_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ax_cv_lib_readline_echo_signal_char="no"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_echo_signal_char ();
+int
+main ()
+{
+return rl_echo_signal_char ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_lib_readline_echo_signal_char="yes"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_echo_signal_char" >&5
+$as_echo "$ax_cv_lib_readline_echo_signal_char" >&6; }
+  if test "$ax_cv_lib_readline_echo_signal_char" != "yes"; then
+    as_fn_error $? "rl_echo_signal_char() is required (install readline6?)" "$LINENO" 5
+  fi
+
+  LIBS="$ORIG_LIBS"
   READLINE_LIBS="$ax_cv_lib_readline"
 
 
@@ -22002,6 +22558,41 @@ else
 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.
+# Check whether --enable-polkit was given.
+if test "${enable_polkit+set}" = set; then :
+  enableval=$enable_polkit; enable_polkit=${enableval}
+else
+  enable_polkit=yes
+fi
+
+if (test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled"); then
+	enable_polkit=yes
+
+$as_echo "#define NM_CONFIG_DEFAULT_AUTH_POLKIT TRUE" >>confdefs.h
+
+	NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT='true'
+else
+
+$as_echo "#define NM_CONFIG_DEFAULT_AUTH_POLKIT FALSE" >>confdefs.h
+
+	NM_CONFIG_DEFAULT_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
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5
@@ -22011,12 +22602,12 @@ if test -n "$POLKIT_CFLAGS"; then
     pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= 0.97\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= 0.97") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-agent-1 >= 0.97\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "polkit-agent-1 >= 0.97") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= 0.97" 2>/dev/null`
+  pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-agent-1 >= 0.97" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -22028,12 +22619,12 @@ if test -n "$POLKIT_LIBS"; then
     pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= 0.97\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= 0.97") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-agent-1 >= 0.97\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "polkit-agent-1 >= 0.97") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= 0.97" 2>/dev/null`
+  pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-agent-1 >= 0.97" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -22054,52 +22645,53 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-gobject-1 >= 0.97" 2>&1`
+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-agent-1 >= 0.97" 2>&1`
         else
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-gobject-1 >= 0.97" 2>&1`
+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-agent-1 >= 0.97" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POLKIT_PKG_ERRORS" >&5
 
-	have_polkit=no
+	have_pk_agent=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_polkit=no
+	have_pk_agent=no
 else
 	POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
 	POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_polkit=yes
+	have_pk_agent=yes
 fi
-# Check whether --enable-polkit was given.
-if test "${enable_polkit+set}" = set; then :
-  enableval=$enable_polkit; enable_polkit=${enableval}
+# Check whether --enable-polkit-agent was given.
+if test "${enable_polkit_agent+set}" = set; then :
+  enableval=$enable_polkit_agent; enable_polkit_agent=${enableval}
 else
-  enable_polkit=${have_polkit}
+  enable_polkit_agent=${have_pk_agent}
 fi
 
-if (test "${enable_polkit}" = "yes"); then
-	if test x"$have_polkit" = x"no"; then
-		as_fn_error $? "PolicyKit development headers are required" "$LINENO" 5
+if (test "${enable_polkit_agent}" = "yes"); then
+	if test x"$have_pk_agent" = x"no"; then
+		as_fn_error $? "Polkit agent is required" "$LINENO" 5
 	fi
 
 
 
-$as_echo "#define WITH_POLKIT 1" >>confdefs.h
+
+$as_echo "#define WITH_POLKIT_AGENT 1" >>confdefs.h
 
 else
 
-$as_echo "#define WITH_POLKIT 0" >>confdefs.h
+$as_echo "#define WITH_POLKIT_AGENT 0" >>confdefs.h
 
 fi
- if test "${enable_polkit}" = "yes"; then
-  WITH_POLKIT_TRUE=
-  WITH_POLKIT_FALSE='#'
+ if test "${enable_polkit_agent}" = "yes"; then
+  WITH_POLKIT_AGENT_TRUE=
+  WITH_POLKIT_AGENT_FALSE='#'
 else
-  WITH_POLKIT_TRUE='#'
-  WITH_POLKIT_FALSE=
+  WITH_POLKIT_AGENT_TRUE='#'
+  WITH_POLKIT_AGENT_FALSE=
 fi
 
 
@@ -22109,9 +22701,6 @@ if test "${enable_modify_system+set}" = set; then :
 fi
 
 if test "${enable_modify_system}" = "yes"; then
-	if ! test "${enable_polkit}" = "yes"; then
-		as_fn_error $? "--enable-modify-system requires --enable-polkit" "$LINENO" 5
-	fi
 	NM_MODIFY_SYSTEM_POLICY="yes"
 else
 	NM_MODIFY_SYSTEM_POLICY="auth_admin_keep"
@@ -22709,6 +23298,106 @@ else
 fi
 
 
+# Bluez5 DUN support
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUEZ5" >&5
+$as_echo_n "checking for BLUEZ5... " >&6; }
+
+if test -n "$BLUEZ5_CFLAGS"; then
+    pkg_cv_BLUEZ5_CFLAGS="$BLUEZ5_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "bluez >= 5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_BLUEZ5_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 5" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$BLUEZ5_LIBS"; then
+    pkg_cv_BLUEZ5_LIBS="$BLUEZ5_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "bluez >= 5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_BLUEZ5_LIBS=`$PKG_CONFIG --libs "bluez >= 5" 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
+	        BLUEZ5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 5" 2>&1`
+        else
+	        BLUEZ5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 5" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$BLUEZ5_PKG_ERRORS" >&5
+
+	have_bluez5=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_bluez5=no
+else
+	BLUEZ5_CFLAGS=$pkg_cv_BLUEZ5_CFLAGS
+	BLUEZ5_LIBS=$pkg_cv_BLUEZ5_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_bluez5=yes
+fi
+# Check whether --enable-bluez5-dun was given.
+if test "${enable_bluez5_dun+set}" = set; then :
+  enableval=$enable_bluez5_dun; enable_bluez5_dun=${enableval}
+else
+  enable_bluez5_dun=${have_bluez5}
+fi
+
+if (test "${enable_bluez5_dun}" = "yes"); then
+	if test x"$have_bluez5" = x"no"; then
+		as_fn_error $? "Bluez 5.x development headers are required" "$LINENO" 5
+	fi
+
+$as_echo "#define WITH_BLUEZ5_DUN 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_BLUEZ5_DUN 0" >>confdefs.h
+
+fi
+ if test "${enable_bluez5_dun}" = "yes"; then
+  WITH_BLUEZ5_DUN_TRUE=
+  WITH_BLUEZ5_DUN_FALSE='#'
+else
+  WITH_BLUEZ5_DUN_TRUE='#'
+  WITH_BLUEZ5_DUN_FALSE=
+fi
+
+
 # DHCP client support
 
 # Check whether --with-dhclient was given.
@@ -22854,12 +23543,26 @@ $as_echo "$as_me: WARNING: Could not find a suitable DHCP client, falling back t
 fi
 # Add substitutions
 if test "$with_dhclient" != "no"; then
+
+$as_echo "#define WITH_DHCLIENT TRUE" >>confdefs.h
+
 	DHCLIENT_PATH=$with_dhclient
 
+else
+
+$as_echo "#define WITH_DHCLIENT FALSE" >>confdefs.h
+
 fi
 if test "$with_dhcpcd" != "no"; then
+
+$as_echo "#define WITH_DHCPCD TRUE" >>confdefs.h
+
 	DHCPCD_PATH=$with_dhcpcd
 
+else
+
+$as_echo "#define WITH_DHCPCD FALSE" >>confdefs.h
+
 fi
 
 # resolvconf and netconfig support
@@ -23249,26 +23952,46 @@ else
 $as_echo "yes" >&6; }
 	have_libsoup=yes
 fi
-if test "$have_libsoup" = "yes"; then
 
-$as_echo "#define HAVE_LIBSOUP 1" >>confdefs.h
+# Check whether --with-libsoup was given.
+if test "${with_libsoup+set}" = set; then :
+  withval=$with_libsoup;
+else
+  with_libsoup=${have_libsoup}
+fi
+
+if test "$with_libsoup" != "no"; then
+	if test "$have_libsoup" != "yes"; then
+		as_fn_error $? "libsoup library not found" "$LINENO" 5
+	fi
+	with_libsoup='yes'
+
+$as_echo "#define WITH_LIBSOUP 1" >>confdefs.h
 
 else
 
-$as_echo "#define HAVE_LIBSOUP 0" >>confdefs.h
+$as_echo "#define WITH_LIBSOUP 0" >>confdefs.h
 
 fi
+ if test "$with_libsoup" != "no"; then
+  WITH_LIBSOUP_TRUE=
+  WITH_LIBSOUP_FALSE='#'
+else
+  WITH_LIBSOUP_TRUE='#'
+  WITH_LIBSOUP_FALSE=
+fi
+
 
 # Check whether --enable-concheck was given.
 if test "${enable_concheck+set}" = set; then :
   enableval=$enable_concheck; enable_concheck=${enableval}
 else
-  enable_concheck=${have_libsoup}
+  enable_concheck=${with_libsoup}
 fi
 
 if (test "${enable_concheck}" = "yes"); then
-	if test x"$have_libsoup" = x"no"; then
-		as_fn_error $? "Connectivity checking requires libsoup development headers" "$LINENO" 5
+	if test x"$with_libsoup" = x"no"; then
+		as_fn_error $? "Connectivity checking requires libsoup" "$LINENO" 5
 	fi
 
 
@@ -23487,17 +24210,42 @@ $as_echo_n "checking for more warnings... " >&6; }
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	CFLAGS="-Wall -std=gnu89 $CFLAGS"
+	CFLAGS_SAVED="$CFLAGS"
+	CFLAGS_MORE_WARNINGS="-Wall -std=gnu89"
+
+					CFLAGS_EXTRA="-Werror=unknown-warning-option"
+	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS_EXTRA $CFLAGS_SAVED"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  has_option=yes
+else
+  has_option=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	if test $has_option = no; then
+		CFLAGS_EXTRA=
+	fi
+	unset has_option
 
 	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
 		      -Wdeclaration-after-statement -Wformat-security \
 		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
+		      -Wstrict-prototypes \
 		      -fno-strict-aliasing -Wno-unused-but-set-variable \
 		      -Wundef -Wimplicit-function-declaration \
 		      -Wpointer-arith -Winit-self \
-		      -Wmissing-include-dirs -Waggregate-return; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
+		      -Wmissing-include-dirs; do
+		CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS_EXTRA $option $CFLAGS_SAVED"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
 $as_echo_n "checking whether gcc understands $option... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23517,24 +24265,38 @@ else
   has_option=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-		if test $has_option = no; then
-			CFLAGS="$SAVE_CFLAGS"
+		if test $has_option != no; then
+			CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"
 		fi
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
 $as_echo "$has_option" >&6; }
 		unset has_option
-		unset SAVE_CFLAGS
 	done
 	unset option
+	unset CFLAGS_EXTRA
 	if test "x$set_more_warnings" = xerror; then
-		CFLAGS="$CFLAGS -Werror"
+		CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
 	fi
+	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS_SAVED"
+	unset CFLAGS_SAVED
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+# Check whether --enable-lto was given.
+if test "${enable_lto+set}" = set; then :
+  enableval=$enable_lto; enable_lto=yes
+else
+  enable_lto=no
+fi
+
+if (test "${enable_lto}" = "yes"); then
+    CFLAGS="-flto $CFLAGS"
+fi
+
+
 
 
 
@@ -24191,6 +24953,8 @@ install_pregen_manpages=no
 if test "$enable_gtk_doc" != "yes" \
 	-a -f man/NetworkManager.conf.5 \
 	-a -f man/nm-settings.5 \
+	-a -f man/nm-settings-keyfile.5 \
+	-a -f man/nm-settings-ifcfg-rh.5 \
 	-a -f man/nmcli-examples.5 \
 	-a -f man/NetworkManager.8; then
 	install_pregen_manpages=yes
@@ -24204,8 +24968,111 @@ else
 fi
 
 
+# check if we can build setting property documentation
+if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then
+    # If g-i is installed we know we have python, but we might not have pygobject
+    if python -c 'from gi.repository import GObject' >& /dev/null; then
+        have_pyobject=yes
+    fi
+
+    # gtk-doc depends on perl, but we can check for it anyway
+    # Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; 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_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # 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_PERL="$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
+
+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    # check for needed perl modules (use YAML; YAML::XS is better, but may not be so widespread)
+    required_perl_modules="YAML"
+    for module in $required_perl_modules; do
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for perl module '$module'" >&5
+$as_echo_n "checking checking for perl module '$module'... " >&6; }
+      if ${PERL} -e 'use '$module 2>/dev/null ; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ok" >&5
+$as_echo "Ok" >&6; }
+          have_perl_modules=yes
+      else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Failed" >&5
+$as_echo "Failed" >&6; }
+          as_fn_error $? "You must have Perl modules to build settings plugin docs: $required_perl_modules." "$LINENO" 5
+      fi
+    done
+
+    if test "$have_pyobject" = "yes" -a "$have_perl_modules" = "yes"; then
+
+$as_echo "#define BUILD_SETTING_DOCS 1" >>confdefs.h
+
+        build_setting_docs=yes
+    fi
+fi
+
+# check for pre-built setting docs
+if test "$build_setting_docs" != "yes" \
+	-a -f man/nm-settings.xml \
+	-a -f man/nm-settings-keyfile.xml \
+	-a -f man/nm-settings-ifcfg-rh.xml \
+	-a -f docs/api/settings-spec.xml \
+	-a -f clients/cli/settings-docs.c; then
 
-ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/config/tests/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/adsl/Makefile src/devices/wimax/Makefile src/devices/bluetooth/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile cli/completion/Makefile tui/Makefile tui/newt/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/nm-system-settings.conf.5 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile"
+$as_echo "#define HAVE_SETTING_DOCS 1" >>confdefs.h
+
+    have_setting_docs=yes
+fi
+
+ if test "$build_setting_docs" = "yes"; then
+  BUILD_SETTING_DOCS_TRUE=
+  BUILD_SETTING_DOCS_FALSE='#'
+else
+  BUILD_SETTING_DOCS_TRUE='#'
+  BUILD_SETTING_DOCS_FALSE=
+fi
+
+ if test "$build_setting_docs" = "yes" -o "$have_setting_docs" = "yes"; then
+  SETTING_DOCS_AVAILABLE_TRUE=
+  SETTING_DOCS_AVAILABLE_FALSE='#'
+else
+  SETTING_DOCS_AVAILABLE_TRUE='#'
+  SETTING_DOCS_AVAILABLE_FALSE=
+fi
+
+
+
+ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/adsl/Makefile src/devices/wimax/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/nm-version.h libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/nm-version.h libnm-util/Makefile libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.conf.xml man/nm-system-settings.conf.5 man/nm-online.1 man/nmcli.1 man/nmtui.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile"
 
 
 
@@ -24361,6 +25228,10 @@ fi
 
 
 
+if test -z "${CONFIG_PLUGIN_IBFT_TRUE}" && test -z "${CONFIG_PLUGIN_IBFT_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_PLUGIN_IBFT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_PLUGIN_IFCFG_RH_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_RH_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_RH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24397,6 +25268,10 @@ 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
 fi
+if test -z "${WITH_UDEV_DIR_TRUE}" && test -z "${WITH_UDEV_DIR_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_UDEV_DIR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24433,8 +25308,8 @@ 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_POLKIT_TRUE}" && test -z "${WITH_POLKIT_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_POLKIT\" was never defined.
+if test -z "${WITH_POLKIT_AGENT_TRUE}" && test -z "${WITH_POLKIT_AGENT_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_POLKIT_AGENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_NSS_TRUE}" && test -z "${WITH_NSS_FALSE}"; then
@@ -24453,6 +25328,14 @@ if test -z "${WITH_MODEM_MANAGER_1_TRUE}" && test -z "${WITH_MODEM_MANAGER_1_FAL
   as_fn_error $? "conditional \"WITH_MODEM_MANAGER_1\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_BLUEZ5_DUN_TRUE}" && test -z "${WITH_BLUEZ5_DUN_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_BLUEZ5_DUN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_LIBSOUP_TRUE}" && test -z "${WITH_LIBSOUP_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBSOUP\" 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
@@ -24497,6 +25380,14 @@ if test -z "${INSTALL_PREGEN_MANPAGES_TRUE}" && test -z "${INSTALL_PREGEN_MANPAG
   as_fn_error $? "conditional \"INSTALL_PREGEN_MANPAGES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_SETTING_DOCS_TRUE}" && test -z "${BUILD_SETTING_DOCS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_SETTING_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${SETTING_DOCS_AVAILABLE_TRUE}" && test -z "${SETTING_DOCS_AVAILABLE_FALSE}"; then
+  as_fn_error $? "conditional \"SETTING_DOCS_AVAILABLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -24894,7 +25785,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 0.9.10.0, which was
+This file was extended by NetworkManager $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24960,7 +25851,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 0.9.10.0
+NetworkManager config.status 1.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25477,10 +26368,9 @@ do
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "include/nm-version.h") CONFIG_FILES="$CONFIG_FILES include/nm-version.h" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
-    "src/config/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/config/tests/Makefile" ;;
+    "src/tests/config/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/config/Makefile" ;;
     "src/dhcp-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dhcp-manager/Makefile" ;;
     "src/dhcp-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/dhcp-manager/tests/Makefile" ;;
     "src/dnsmasq-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/dnsmasq-manager/tests/Makefile" ;;
@@ -25494,12 +26384,13 @@ do
     "src/settings/plugins/ifcfg-rh/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-rh/Makefile" ;;
     "src/settings/plugins/ifcfg-rh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-rh/tests/Makefile" ;;
     "src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile" ;;
+    "src/settings/plugins/ibft/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ibft/Makefile" ;;
+    "src/settings/plugins/ibft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ibft/tests/Makefile" ;;
     "src/settings/plugins/ifcfg-suse/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-suse/Makefile" ;;
     "src/settings/plugins/keyfile/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/Makefile" ;;
     "src/settings/plugins/keyfile/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/tests/Makefile" ;;
     "src/settings/plugins/keyfile/tests/keyfiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/tests/keyfiles/Makefile" ;;
     "src/settings/plugins/example/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/example/Makefile" ;;
-    "src/settings/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/tests/Makefile" ;;
     "src/platform/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/Makefile" ;;
     "src/platform/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/tests/Makefile" ;;
     "src/rdisc/Makefile") CONFIG_FILES="$CONFIG_FILES src/rdisc/Makefile" ;;
@@ -25507,13 +26398,20 @@ do
     "src/devices/adsl/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/adsl/Makefile" ;;
     "src/devices/wimax/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wimax/Makefile" ;;
     "src/devices/bluetooth/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/bluetooth/Makefile" ;;
+    "src/devices/team/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/team/Makefile" ;;
     "src/devices/wifi/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wifi/Makefile" ;;
     "src/devices/wifi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wifi/tests/Makefile" ;;
     "src/devices/wwan/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wwan/Makefile" ;;
+    "libnm-core/nm-version.h") CONFIG_FILES="$CONFIG_FILES libnm-core/nm-version.h" ;;
+    "libnm-core/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-core/Makefile" ;;
+    "libnm-core/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-core/tests/Makefile" ;;
+    "libnm/libnm.pc") CONFIG_FILES="$CONFIG_FILES libnm/libnm.pc" ;;
+    "libnm/Makefile") CONFIG_FILES="$CONFIG_FILES libnm/Makefile" ;;
+    "libnm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm/tests/Makefile" ;;
     "libnm-util/libnm-util.pc") CONFIG_FILES="$CONFIG_FILES libnm-util/libnm-util.pc" ;;
+    "libnm-util/nm-version.h") CONFIG_FILES="$CONFIG_FILES libnm-util/nm-version.h" ;;
     "libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/Makefile" ;;
     "libnm-util/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/tests/Makefile" ;;
-    "libnm-util/tests/certs/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/tests/certs/Makefile" ;;
     "libnm-glib/libnm-glib.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib.pc" ;;
     "libnm-glib/libnm-glib-vpn.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib-vpn.pc" ;;
     "libnm-glib/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-glib/Makefile" ;;
@@ -25521,12 +26419,10 @@ do
     "callouts/Makefile") CONFIG_FILES="$CONFIG_FILES callouts/Makefile" ;;
     "callouts/tests/Makefile") CONFIG_FILES="$CONFIG_FILES callouts/tests/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-    "cli/Makefile") CONFIG_FILES="$CONFIG_FILES cli/Makefile" ;;
-    "cli/src/Makefile") CONFIG_FILES="$CONFIG_FILES cli/src/Makefile" ;;
-    "cli/completion/Makefile") CONFIG_FILES="$CONFIG_FILES cli/completion/Makefile" ;;
-    "tui/Makefile") CONFIG_FILES="$CONFIG_FILES tui/Makefile" ;;
-    "tui/newt/Makefile") CONFIG_FILES="$CONFIG_FILES tui/newt/Makefile" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+    "clients/Makefile") CONFIG_FILES="$CONFIG_FILES clients/Makefile" ;;
+    "clients/cli/Makefile") CONFIG_FILES="$CONFIG_FILES clients/cli/Makefile" ;;
+    "clients/tui/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/Makefile" ;;
+    "clients/tui/newt/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/newt/Makefile" ;;
     "initscript/RedHat/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/NetworkManager" ;;
     "initscript/Debian/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Debian/NetworkManager" ;;
     "initscript/Slackware/rc.networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Slackware/rc.networkmanager" ;;
@@ -25537,9 +26433,11 @@ do
     "introspection/Makefile") CONFIG_FILES="$CONFIG_FILES introspection/Makefile" ;;
     "introspection/all.xml") CONFIG_FILES="$CONFIG_FILES introspection/all.xml" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "man/NetworkManager.conf.xml") CONFIG_FILES="$CONFIG_FILES man/NetworkManager.conf.xml" ;;
     "man/nm-system-settings.conf.5") CONFIG_FILES="$CONFIG_FILES man/nm-system-settings.conf.5" ;;
     "man/nm-online.1") CONFIG_FILES="$CONFIG_FILES man/nm-online.1" ;;
     "man/nmcli.1") CONFIG_FILES="$CONFIG_FILES man/nmcli.1" ;;
+    "man/nmtui.1") CONFIG_FILES="$CONFIG_FILES man/nmtui.1" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "policy/Makefile") CONFIG_FILES="$CONFIG_FILES policy/Makefile" ;;
     "policy/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES policy/org.freedesktop.NetworkManager.policy.in" ;;
@@ -25551,6 +26449,8 @@ do
     "docs/libnm-glib/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm-glib/version.xml" ;;
     "docs/libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/Makefile" ;;
     "docs/libnm-util/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/version.xml" ;;
+    "docs/libnm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm/Makefile" ;;
+    "docs/libnm/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm/version.xml" ;;
     "NetworkManager.pc") CONFIG_FILES="$CONFIG_FILES NetworkManager.pc" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     "examples/shell/Makefile") CONFIG_FILES="$CONFIG_FILES examples/shell/Makefile" ;;
@@ -27384,13 +28284,14 @@ echo "  session tracking: $with_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)"
+		echo "  policykit: yes (permissive modify.system) (default=${enable_polkit})"
 	else
-		echo "  policykit: yes (restrictive modify.system)"
+		echo "  policykit: yes (restrictive modify.system) (default=${enable_polkit})"
 	fi
 else
 	echo  "  policykit: no"
 fi
+echo "  polkit agent: ${enable_polkit_agent}"
 echo "  selinux: $have_selinux"
 echo
 
@@ -27404,7 +28305,8 @@ echo "  libteamdctl: $enable_teamdctl"
 echo "  nmtui: $build_nmtui"
 echo
 
-echo "Configuration plugins"
+echo "Configuration plugins (main.plugins=${config_plugins_default})"
+echo "  ibft: ${enable_config_plugin_ibft}"
 echo "  ifcfg-rh: ${enable_ifcfg_rh}"
 echo "  ifcfg-suse: ${enable_ifcfg_suse}"
 echo "  ifupdown: ${enable_ifupdown}"
@@ -27426,4 +28328,5 @@ echo "  documentation: $enable_gtk_doc"
 echo "  tests: $enable_tests"
 echo "  valgrind: $with_valgrind"
 echo "  code coverage: $enable_code_coverage"
+echo "  LTO: $enable_lto"
 echo