Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 1245 insertions, 997 deletions

diff --git a/configure b/configure
index 775544bb..acb348d7 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.0.10.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.90.
 #
 # 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.0.10'
-PACKAGE_STRING='NetworkManager 1.0.10'
+PACKAGE_VERSION='1.1.90'
+PACKAGE_STRING='NetworkManager 1.1.90'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -682,6 +682,9 @@ BUILD_NMTUI_FALSE
 BUILD_NMTUI_TRUE
 NEWT_LIBS
 NEWT_CFLAGS
+BUILD_NMCLI_FALSE
+BUILD_NMCLI_TRUE
+READLINE_LIBS
 LIBNDP_LIBS
 LIBNDP_CFLAGS
 WITH_CONCHECK_FALSE
@@ -692,6 +695,7 @@ LIBSOUP_LIBS
 LIBSOUP_CFLAGS
 KERNEL_FIRMWARE_DIR
 SYSTEM_CA_PATH
+DNSSEC_TRIGGER_SCRIPT
 DNSMASQ_PATH
 IPTABLES_PATH
 with_netconfig
@@ -708,7 +712,6 @@ WITH_MODEM_MANAGER_1_FALSE
 WITH_MODEM_MANAGER_1_TRUE
 MM_GLIB_LIBS
 MM_GLIB_CFLAGS
-PPPOE_PATH
 PPPD_PATH
 PPPD_PLUGIN_DIR
 WITH_PPP_FALSE
@@ -721,9 +724,6 @@ WITH_GNUTLS_FALSE
 WITH_GNUTLS_TRUE
 WITH_NSS_FALSE
 WITH_NSS_TRUE
-LIBGCRYPT_LIBS
-LIBGCRYPT_CFLAGS
-LIBGCRYPT_CONFIG
 GNUTLS_LIBS
 GNUTLS_CFLAGS
 NSS_LIBS
@@ -738,32 +738,28 @@ WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
 LIBTEAMDCTL_LIBS
 LIBTEAMDCTL_CFLAGS
-WITH_WIMAX_FALSE
-WITH_WIMAX_TRUE
-IWMX_SDK_LIBS
-IWMX_SDK_CFLAGS
-READLINE_LIBS
 UUID_LIBS
 UUID_CFLAGS
 LIBNL_LIBS
 LIBNL_CFLAGS
-HAVE_SELINUX_FALSE
-HAVE_SELINUX_TRUE
+NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT
+LIBAUDIT_LIBS
+LIBAUDIT_CFLAGS
 SELINUX_LIBS
 SELINUX_CFLAGS
+SUSPEND_RESUME_CONSOLEKIT_FALSE
+SUSPEND_RESUME_CONSOLEKIT_TRUE
 SUSPEND_RESUME_SYSTEMD_FALSE
 SUSPEND_RESUME_SYSTEMD_TRUE
 SUSPEND_RESUME_UPOWER_FALSE
 SUSPEND_RESUME_UPOWER_TRUE
 SYSTEMD_INHIBIT_LIBS
 SYSTEMD_INHIBIT_CFLAGS
-CKDB_PATH
 SYSTEMD_LOGIN_LIBS
 SYSTEMD_LOGIN_CFLAGS
-SESSION_TRACKING_SYSTEMD_FALSE
-SESSION_TRACKING_SYSTEMD_TRUE
-SESSION_TRACKING_CK_FALSE
-SESSION_TRACKING_CK_TRUE
+NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT
+SYSTEMD_JOURNAL_LIBS
+SYSTEMD_JOURNAL_CFLAGS
 HAVE_SYSTEMD_200_FALSE
 HAVE_SYSTEMD_200_TRUE
 SYSTEMD_200_LIBS
@@ -791,16 +787,14 @@ INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
 GUDEV_LIBS
 GUDEV_CFLAGS
+WITH_LEGACY_LIBRARIES_FALSE
+WITH_LEGACY_LIBRARIES_TRUE
+DBUS_LIBS
+DBUS_CFLAGS
 AM_TESTS_FD_REDIRECT
 LOG_DRIVER
 GLIB_LIBS
 GLIB_CFLAGS
-HAVE_DBUS_GLIB_100_FALSE
-HAVE_DBUS_GLIB_100_TRUE
-DBUS_GLIB_100_LIBS
-DBUS_GLIB_100_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -823,8 +817,6 @@ CONFIG_PLUGIN_IFNET_FALSE
 CONFIG_PLUGIN_IFNET_TRUE
 CONFIG_PLUGIN_IFUPDOWN_FALSE
 CONFIG_PLUGIN_IFUPDOWN_TRUE
-CONFIG_PLUGIN_IFCFG_SUSE_FALSE
-CONFIG_PLUGIN_IFCFG_SUSE_TRUE
 CONFIG_PLUGIN_IFCFG_RH_FALSE
 CONFIG_PLUGIN_IFCFG_RH_TRUE
 CONFIG_PLUGIN_IBFT_FALSE
@@ -832,8 +824,10 @@ CONFIG_PLUGIN_IBFT_TRUE
 nmrundir
 nmstatedir
 nmdatadir
+nmlibdir
 nmconfdir
 nmbinary
+runstatedir
 GETTEXT_PACKAGE
 POSUB
 LTLIBINTL
@@ -899,7 +893,6 @@ ac_ct_AR
 AR
 DLLTOOL
 OBJDUMP
-LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
@@ -915,6 +908,7 @@ build_vendor
 build_cpu
 build
 LIBTOOL
+LN_S
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
@@ -1037,14 +1031,20 @@ enable_code_coverage
 with_dist_version
 enable_wifi
 with_wext
+with_libnm_glib
 enable_introspection
 enable_qt
 with_udev_dir
 with_systemdsystemunitdir
+with_hostname_persist
+with_systemd_journal
+with_config_logging_backend_default
+with_systemd_logind
+with_consolekit
 with_session_tracking
 with_suspend_resume
 with_selinux
-enable_wimax
+with_libaudit
 enable_teamdctl
 enable_polkit
 enable_polkit_agent
@@ -1054,7 +1054,6 @@ with_dbus_sys_dir
 enable_ppp
 with_pppd_plugin_dir
 with_pppd
-with_pppoe
 with_modem_manager_1
 enable_bluez5_dun
 with_dhclient
@@ -1063,13 +1062,16 @@ with_resolvconf
 with_netconfig
 with_iptables
 with_dnsmasq
+with_dnssec_trigger
 with_system_ca_path
 with_kernel_firmware_dir
 with_libsoup
 enable_concheck
+with_nmcli
 with_nmtui
 enable_more_warnings
 enable_more_asserts
+with_more_asserts
 enable_more_logging
 enable_lto
 enable_vala
@@ -1099,30 +1101,30 @@ CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-DBUS_CFLAGS
-DBUS_LIBS
-DBUS_GLIB_100_CFLAGS
-DBUS_GLIB_100_LIBS
 GLIB_CFLAGS
 GLIB_LIBS
+DBUS_CFLAGS
+DBUS_LIBS
 GUDEV_CFLAGS
 GUDEV_LIBS
 QT_CFLAGS
 QT_LIBS
 SYSTEMD_200_CFLAGS
 SYSTEMD_200_LIBS
+SYSTEMD_JOURNAL_CFLAGS
+SYSTEMD_JOURNAL_LIBS
 SYSTEMD_LOGIN_CFLAGS
 SYSTEMD_LOGIN_LIBS
 SYSTEMD_INHIBIT_CFLAGS
 SYSTEMD_INHIBIT_LIBS
 SELINUX_CFLAGS
 SELINUX_LIBS
+LIBAUDIT_CFLAGS
+LIBAUDIT_LIBS
 LIBNL_CFLAGS
 LIBNL_LIBS
 UUID_CFLAGS
 UUID_LIBS
-IWMX_SDK_CFLAGS
-IWMX_SDK_LIBS
 LIBTEAMDCTL_CFLAGS
 LIBTEAMDCTL_LIBS
 POLKIT_CFLAGS
@@ -1683,7 +1685,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.0.10 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.1.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1753,7 +1755,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.0.10:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.1.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1781,6 +1783,7 @@ Optional Features:
                           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
@@ -1788,7 +1791,6 @@ Optional Features:
   --enable-introspection=[no/auto/yes]
                           Enable introspection for this build
   --enable-qt             enable Qt examples
-  --enable-wimax          enable WiMAX support
   --enable-teamdctl       enable Teamd control support
   --enable-polkit=yes|no|disabled
                           set default value for auth-polkit configuration
@@ -1801,7 +1803,8 @@ Optional Features:
   --enable-bluez5-dun     enable Bluez5 DUN support
   --enable-concheck       enable connectivity checking support
   --enable-more-warnings  Possible values: no/yes/error
-  --enable-more-asserts   Enable more assertions for debugging (default: no)
+  --enable-more-asserts   Enable more assertions for debugging (default: no).
+                          Deprecated option. Use --with-more-asserts=level
   --enable-more-logging   Enable more debug logging (default: no)
   --enable-lto            Enable Link Time Optimization for smaller size
                           (default: no)
@@ -1836,18 +1839,34 @@ 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-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-hostname-persist=default|suse|gentoo
+                          Hostname persist method
+  --with-systemd-journal=yes|no
+                          Use systemd journal for logging
+  --with-logging-backend-default=backend
+                          Default value for logging.backend
+  --with-systemd-logind=yes|no
+                          Support systemd session tracking
+  --with-consolekit=yes|no
+                          Support consolekit session tracking
   --with-session-tracking=systemd|consolekit|no
-                          Select session tracking support (default:
-                          consolekit)
-  --with-suspend-resume=upower|systemd
+                          Compatibility option to choose one session tracking
+                          module
+  --with-suspend-resume=upower|systemd|consolekit
                           Build NetworkManager with specific suspend/resume
                           support
   --with-selinux=yes|no|auto
                           Build with SELinux (default: auto)
+  --with-libaudit=yes|yes-disabled-by-default|no|auto
+                          Build with audit daemon support (default: auto).
+                          yes-disabled-by-default enables support, but
+                          disables it unless explicitly configured via
+                          NetworkManager.conf
   --with-crypto=nss|gnutls
                           Cryptography library to use for certificate and key
                           operations
@@ -1856,8 +1875,6 @@ Optional Packages:
                           path to the pppd plugins directory
   --with-pppd=/path/to/pppd
                           path to pppd binary
-  --with-pppoe=/path/to/pppoe
-                          path to pppoe binary
   --with-modem-manager-1  Enable new ModemManager1 interface support
   --with-dhclient=yes|no|path
                           Enable dhclient 4.x support
@@ -1870,13 +1887,18 @@ Optional Packages:
                           path to iptables
   --with-dnsmasq=/path/to/dnsmasq
                           path to dnsmasq
+  --with-dnssec-trigger=/path/to/dnssec-trigger-script
+                          path to unbound dnssec-trigger-script
   --with-system-ca-path=/path/to/ssl/certs
                           path to system CA certificates
   --with-kernel-firmware-dir=DIR
                           where kernel firmware directory is (default is
                           /lib/firmware)
   --with-libsoup=yes|no   Link against libsoup
+  --with-nmcli=yes|no     Build nmcli
   --with-nmtui=yes|no     Build nmtui
+  --with-more-asserts=level
+                          Enable more assertions for debugging (default: 0)
   --with-valgrind=yes|no|path
                           Use valgrind to memory-check the tests (default: no)
   --with-tests            Build NetworkManager tests (deprecated)
@@ -1903,14 +1925,10 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
-  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
-  DBUS_GLIB_100_CFLAGS
-              C compiler flags for DBUS_GLIB_100, overriding pkg-config
-  DBUS_GLIB_100_LIBS
-              linker flags for DBUS_GLIB_100, overriding pkg-config
   GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
   GLIB_LIBS   linker flags for GLIB, overriding pkg-config
+  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
   GUDEV_CFLAGS
               C compiler flags for GUDEV, overriding pkg-config
   GUDEV_LIBS  linker flags for GUDEV, overriding pkg-config
@@ -1920,6 +1938,10 @@ Some influential environment variables:
               C compiler flags for SYSTEMD_200, overriding pkg-config
   SYSTEMD_200_LIBS
               linker flags for SYSTEMD_200, overriding pkg-config
+  SYSTEMD_JOURNAL_CFLAGS
+              C compiler flags for SYSTEMD_JOURNAL, overriding pkg-config
+  SYSTEMD_JOURNAL_LIBS
+              linker flags for SYSTEMD_JOURNAL, overriding pkg-config
   SYSTEMD_LOGIN_CFLAGS
               C compiler flags for SYSTEMD_LOGIN, overriding pkg-config
   SYSTEMD_LOGIN_LIBS
@@ -1932,15 +1954,15 @@ Some influential environment variables:
               C compiler flags for SELINUX, overriding pkg-config
   SELINUX_LIBS
               linker flags for SELINUX, overriding pkg-config
+  LIBAUDIT_CFLAGS
+              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
-  IWMX_SDK_CFLAGS
-              C compiler flags for IWMX_SDK, overriding pkg-config
-  IWMX_SDK_LIBS
-              linker flags for IWMX_SDK, overriding pkg-config
   LIBTEAMDCTL_CFLAGS
               C compiler flags for LIBTEAMDCTL, overriding pkg-config
   LIBTEAMDCTL_LIBS
@@ -2040,7 +2062,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.0.10
+NetworkManager configure 1.1.90
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2580,11 +2602,194 @@ $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
 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.0.10, which was
+It was created by NetworkManager $as_me 1.1.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3454,7 +3659,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.0.10'
+ VERSION='1.1.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6339,6 +6544,18 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
 
 case `pwd` in
   *\ * | *\	*)
@@ -6992,17 +7209,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
@@ -17333,10 +17539,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=0
-NM_MICRO_VERSION=10
-NM_VERSION=1.0.10
-NM_GIT_SHA=c163759fe463d1f4e1f4f8599c7ff3e4b537fe0d
+NM_MINOR_VERSION=1
+NM_MICRO_VERSION=90
+NM_VERSION=1.1.90
+NM_GIT_SHA=83d043b1126ad8037260308302f55261ca33b40b
 
 
 
@@ -17359,6 +17565,39 @@ _ACEOF
 
 fi
 
+# 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 dev_t" >&5
+$as_echo_n "checking size of dev_t... " >&6; }
+if ${ac_cv_sizeof_dev_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_dev_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 (dev_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_dev_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5
+$as_echo "$ac_cv_sizeof_dev_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t
+_ACEOF
+
+
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
@@ -20033,16 +20272,24 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  esac
 
 
+# Add runstatedir if not specified manually in autoconf < 2.70
+if test -z "$runstatedir"; then :
+  runstatedir="$localstatedir/run"
+fi
+
+
 # NetworkManager paths
-nmbinary="$sbindir/$PACKAGE"
+nmbinary='${sbindir}'/$PACKAGE
+
+nmconfdir='${sysconfdir}'/$PACKAGE
 
-nmconfdir="$sysconfdir/$PACKAGE"
+nmlibdir='${prefix}'/lib/$PACKAGE
 
-nmdatadir="$datadir/$PACKAGE"
+nmdatadir='${datadir}'/$PACKAGE
 
-nmstatedir="$localstatedir/lib/$PACKAGE"
+nmstatedir='${localstatedir}'/lib/$PACKAGE
 
-nmrundir="$localstatedir/run/$PACKAGE"
+nmrundir='${runstatedir}'/$PACKAGE
 
 
 # Alternative configuration plugins
@@ -20232,14 +20479,6 @@ else
   CONFIG_PLUGIN_IFCFG_RH_FALSE=
 fi
 
- if test "$enable_ifcfg_suse" = "yes"; then
-  CONFIG_PLUGIN_IFCFG_SUSE_TRUE=
-  CONFIG_PLUGIN_IFCFG_SUSE_FALSE='#'
-else
-  CONFIG_PLUGIN_IFCFG_SUSE_TRUE='#'
-  CONFIG_PLUGIN_IFCFG_SUSE_FALSE=
-fi
-
  if test "$enable_ifupdown" = "yes"; then
   CONFIG_PLUGIN_IFUPDOWN_TRUE=
   CONFIG_PLUGIN_IFUPDOWN_FALSE='#'
@@ -20268,17 +20507,32 @@ 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
 
+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#,}"
+
+
 cat >>confdefs.h <<_ACEOF
 #define CONFIG_PLUGINS_DEFAULT "$config_plugins_default"
 _ACEOF
 
+if test "${enable_config_plugin_ibft}" = yes; then
+
+$as_echo "#define WITH_SETTINGS_PLUGIN_IBFT 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_SETTINGS_PLUGIN_IBFT 0" >>confdefs.h
+
+fi
 
 if test "$enable_ifcfg_rh" = "yes"; then
     DISTRO_NETWORK_SERVICE=network.service
@@ -21034,237 +21288,6 @@ $as_echo "no" >&6; }
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
-$as_echo_n "checking for DBUS... " >&6; }
-
-if test -n "$DBUS_CFLAGS"; then
-    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1 dbus-glib-1 >= 0.94\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$DBUS_LIBS"; then
-    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1 dbus-glib-1 >= 0.94\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 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
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1`
-        else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (dbus-1 >= 1.1 dbus-glib-1 >= 0.94) were not met:
-
-$DBUS_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 DBUS_CFLAGS
-and DBUS_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 DBUS_CFLAGS
-and DBUS_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
-	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-	DBUS_LIBS=$pkg_cv_DBUS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_g_method_invocation_get_g_connection in -ldbus-glib-1" >&5
-$as_echo_n "checking for dbus_g_method_invocation_get_g_connection in -ldbus-glib-1... " >&6; }
-if ${ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldbus-glib-1  $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 dbus_g_method_invocation_get_g_connection ();
-int
-main ()
-{
-return dbus_g_method_invocation_get_g_connection ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection=yes
-else
-  ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection=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_dbus_glib_1_dbus_g_method_invocation_get_g_connection" >&5
-$as_echo "$ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection" >&6; }
-if test "x$ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection" = xyes; then :
-  ac_have_gmi_get_con="1"
-else
-  ac_have_gmi_get_con="0"
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DBUS_GLIB_GMI_GET_CONNECTION $ac_have_gmi_get_con
-_ACEOF
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB_100" >&5
-$as_echo_n "checking for DBUS_GLIB_100... " >&6; }
-
-if test -n "$DBUS_GLIB_100_CFLAGS"; then
-    pkg_cv_DBUS_GLIB_100_CFLAGS="$DBUS_GLIB_100_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.100\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.100") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_GLIB_100_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.100" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$DBUS_GLIB_100_LIBS"; then
-    pkg_cv_DBUS_GLIB_100_LIBS="$DBUS_GLIB_100_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.100\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.100") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_GLIB_100_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.100" 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
-	        DBUS_GLIB_100_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= 0.100" 2>&1`
-        else
-	        DBUS_GLIB_100_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= 0.100" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_GLIB_100_PKG_ERRORS" >&5
-
-	have_dbus_glib_100=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_dbus_glib_100=no
-else
-	DBUS_GLIB_100_CFLAGS=$pkg_cv_DBUS_GLIB_100_CFLAGS
-	DBUS_GLIB_100_LIBS=$pkg_cv_DBUS_GLIB_100_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_dbus_glib_100=yes
-fi
-if (test "${have_dbus_glib_100}" = "yes"); then
-
-$as_echo "#define HAVE_DBUS_GLIB_100 1" >>confdefs.h
-
-else
-
-$as_echo "#define HAVE_DBUS_GLIB_100 0" >>confdefs.h
-
-fi
- if test "${have_dbus_glib_100}" = "yes"; then
-  HAVE_DBUS_GLIB_100_TRUE=
-  HAVE_DBUS_GLIB_100_FALSE='#'
-else
-  HAVE_DBUS_GLIB_100_TRUE='#'
-  HAVE_DBUS_GLIB_100_FALSE=
-fi
-
-
-
-pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
 $as_echo_n "checking for GLIB... " >&6; }
 
@@ -21528,6 +21551,105 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V
 
 
 
+# Check whether --with-libnm-glib was given.
+if test "${with_libnm_glib+set}" = set; then :
+  withval=$with_libnm_glib;
+fi
+
+if test "$with_libnm_glib" != "no"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+$as_echo_n "checking for DBUS... " >&6; }
+
+if test -n "$DBUS_CFLAGS"; then
+    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1 dbus-glib-1 >= 0.94\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$DBUS_LIBS"; then
+    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1 dbus-glib-1 >= 0.94\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 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
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1`
+        else
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DBUS_PKG_ERRORS" >&5
+
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "$DBUS_PKG_ERRORS
+
+Configure with --without-libnm-glib if you do not need the legacy libraries
+See \`config.log' 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 $? "$DBUS_PKG_ERRORS
+
+Configure with --without-libnm-glib if you do not need the legacy libraries
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+	DBUS_LIBS=$pkg_cv_DBUS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+    with_libnm_glib=yes
+fi
+ if test "$with_libnm_glib" != "no"; then
+  WITH_LEGACY_LIBRARIES_TRUE=
+  WITH_LEGACY_LIBRARIES_FALSE='#'
+else
+  WITH_LEGACY_LIBRARIES_TRUE='#'
+  WITH_LEGACY_LIBRARIES_FALSE=
+fi
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5
 $as_echo_n "checking for GUDEV... " >&6; }
@@ -21622,8 +21744,6 @@ fi
 
 
 
-
-
                 # Check whether --enable-introspection was given.
 if test "${enable_introspection+set}" = set; then :
   enableval=$enable_introspection;
@@ -21799,8 +21919,6 @@ if (test "${enable_qt}" = "yes"); then
 	if test x"$have_qt" = x"no"; then
 		as_fn_error $? "Qt development headers are required" "$LINENO" 5
 	fi
-
-
 	# Check for moc-qt4 and if not found then moc
 	QT4_BINDIR=`$PKG_CONFIG QtCore --variable moc_location`
 	for ac_prog in moc-qt4 moc
@@ -21998,49 +22116,362 @@ else
 fi
 
 
-# session tracking support
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Session tracking support" >&5
-$as_echo_n "checking Session tracking support... " >&6; }
+# Hostname persist mode
 
-# Check whether --with-session-tracking was given.
-if test "${with_session_tracking+set}" = set; then :
-  withval=$with_session_tracking;
+# Check whether --with-hostname-persist was given.
+if test "${with_hostname_persist+set}" = set; then :
+  withval=$with_hostname_persist;
 fi
 
-# default to consolekit
-if test -z "$with_session_tracking"; then :
-  with_session_tracking=consolekit
+
+if test "$with_hostname_persist" = "suse"; then :
+  hostname_persist=suse
 fi
-if test "$with_session_tracking" = "ck"; then :
-  with_session_tracking=consolekit
+if test "$with_hostname_persist" = "gentoo"; then :
+  hostname_persist=gentoo
 fi
-if test "$with_session_tracking" = "none"; then :
-  with_session_tracking=no
+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 :
+  hostname_persist=suse
+fi
+if test -z "$hostname_persist" -a "$distro_plugins" = "ifnet"; then :
+  hostname_persist=gentoo
+fi
+if test -z "$hostname_persist"; then :
+  hostname_persist=default
+fi
+
+if test "$hostname_persist" = suse; then
+
+$as_echo "#define HOSTNAME_PERSIST_SUSE 1" >>confdefs.h
+
+elif test "$hostname_persist" = gentoo; then
+
+$as_echo "#define HOSTNAME_PERSIST_GENTOO 1" >>confdefs.h
+
+fi
+
+
+# Check whether --with-systemd-journal was given.
+if test "${with_systemd_journal+set}" = set; then :
+  withval=$with_systemd_journal;
+fi
+
+have_systemd_journal=no
+if test "$with_systemd_journal" != "no"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5
+$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; }
+
+if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then
+    pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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_JOURNAL_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_JOURNAL_LIBS"; then
+    pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_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_JOURNAL_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_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
+        else
+	        SYSTEMD_JOURNAL_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_JOURNAL_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5
+$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; }
+
+if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then
+    pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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-journal\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-journal" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
-# check value
-if ! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"); then :
-  as_fn_error $? "--with-session-tracking must be systemd/consolekit/no
+if test -n "$SYSTEMD_JOURNAL_LIBS"; then
+    pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_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-journal\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd-journal" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  not $with_session_tracking" "$LINENO" 5
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
-# add conditionals and subtitutions
- if test "$with_session_tracking" = "consolekit"; then
-  SESSION_TRACKING_CK_TRUE=
-  SESSION_TRACKING_CK_FALSE='#'
+
+
+
+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
-  SESSION_TRACKING_CK_TRUE='#'
-  SESSION_TRACKING_CK_FALSE=
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1`
+        else
+	        SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5
+
+	have_systemd_journal=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_systemd_journal=no
+else
+	SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS
+	SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_systemd_journal=yes
+fi
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
- if test "$with_session_tracking" = "systemd"; then
-  SESSION_TRACKING_SYSTEMD_TRUE=
-  SESSION_TRACKING_SYSTEMD_FALSE='#'
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5
+$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; }
+
+if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then
+    pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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-journal\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-journal" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  SESSION_TRACKING_SYSTEMD_TRUE='#'
-  SESSION_TRACKING_SYSTEMD_FALSE=
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
+if test -n "$SYSTEMD_JOURNAL_LIBS"; then
+    pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_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-journal\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd-journal" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
 
-if test "$with_session_tracking" = "systemd"; then
+
+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_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal" 2>&1`
+        else
+	        SYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_JOURNAL_PKG_ERRORS" >&5
+
+	have_systemd_journal=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_systemd_journal=no
+else
+	SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS
+	SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_systemd_journal=yes
+fi
+else
+	SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS
+	SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_systemd_journal=yes
+fi
+	if test "$have_systemd_journal" != "yes"; then
+		if test "$with_systemd_journal" = "yes"; then
+			as_fn_error $? "Missing systemd-journald support" "$LINENO" 5
+		fi
+	fi
+fi
+if test "$have_systemd_journal" = "yes"; then
+
+$as_echo "#define SYSTEMD_JOURNAL 1" >>confdefs.h
+
+else
+
+$as_echo "#define SYSTEMD_JOURNAL 0" >>confdefs.h
+
+fi
+
+
+# Check whether --with-config-logging-backend-default was given.
+if test "${with_config_logging_backend_default+set}" = set; then :
+  withval=$with_config_logging_backend_default; nm_config_logging_backend_default="$withval"
+else
+  nm_config_logging_backend_default=""
+fi
+
+if test "$nm_config_logging_backend_default" != 'debug' \
+     -a "$nm_config_logging_backend_default" != 'syslog' \
+     -a "$nm_config_logging_backend_default" != 'journal' \
+     -a "$nm_config_logging_backend_default" != 'journal-syslog-style'; then
+	# unknown backend. Reset to default. Silently accept the invalid value to
+	# be future proof.
+	nm_config_logging_backend_default=''
+fi
+if test "$nm_config_logging_backend_default" = ""; then
+	if test "$have_systemd_journal" = "yes"; then
+		nm_config_logging_backend_default='journal-syslog-style'
+	else
+		nm_config_logging_backend_default='syslog'
+	fi
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define NM_CONFIG_LOGGING_BACKEND_DEFAULT "$nm_config_logging_backend_default"
+_ACEOF
+
+NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT="$nm_config_logging_backend_default"
+
+
+# Session tracking support
+
+# Check whether --with-systemd-logind was given.
+if test "${with_systemd_logind+set}" = set; then :
+  withval=$with_systemd_logind;
+fi
+
+
+# Check whether --with-consolekit was given.
+if test "${with_consolekit+set}" = set; then :
+  withval=$with_consolekit;
+fi
+
+
+# Check whether --with-session-tracking was given.
+if test "${with_session_tracking+set}" = set; then :
+  withval=$with_session_tracking;
+fi
+
+# backwards compatibility
+if test "$with_session_tracking" = "ck"; then :
+  use_consolekit="yes" use_systemd_logind="no"
+fi
+if test "$with_session_tracking" = "consolekit"; then :
+  use_consolekit="yes" use_systemd_logind="no"
+fi
+if test "$with_session_tracking" = "systemd"; then :
+  use_consolekit="no" use_systemd_logind="yes"
+fi
+if test "$with_session_tracking" = "no"; then :
+  use_consolekit="no" use_systemd_logind="no"
+fi
+if test "$with_session_tracking" = "none"; then :
+  use_consolekit="no" use_systemd_logind="no"
+fi
+# current options
+if test -n "$with_systemd_logind" ; then :
+  use_systemd_logind="$with_systemd_logind"
+fi
+if test -n "$with_consolekit" ; then :
+  use_consolekit="$with_consolekit"
+fi
+# defaults
+if test -z "$use_systemd_logind"; then :
+  use_systemd_logind="auto"
+fi
+if test -z "$use_consolekit"; then :
+  use_consolekit="yes"
+fi
+# output
+session_tracking=
+if test "$use_systemd_logind" = "yes" -o "$use_systemd_logind" = "auto"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5
@@ -22159,37 +22590,17 @@ 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
+	have_systemd_logind=no
 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; }
+	have_systemd_logind=no
 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; }
-
+	have_systemd_logind=yes
 fi
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -22253,54 +22664,47 @@ 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
+	have_systemd_logind=no
 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; }
+	have_systemd_logind=no
 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; }
-
+	have_systemd_logind=yes
 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; }
-
+	have_systemd_logind=yes
+fi
+else
+    have_systemd_logind=no
+fi
+if test "$use_systemd_logind" = "yes" -a "$have_systemd_logind" = "no"; then
+    as_fn_error $? "You must have libsystemd installed to build with systemd-logind support." "$LINENO" 5
 fi
+if test "$have_systemd_logind" = "yes"; then
 
+$as_echo "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h
 
+	session_tracking="$session_tracking, systemd-logind"
 fi
-if test "$with_session_tracking" = "consolekit"; then
-	CKDB_PATH=/var/run/ConsoleKit/database
+if test "$use_consolekit" = "yes"; then
+
+$as_echo "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h
 
+
+$as_echo "#define CKDB_PATH \"/var/run/ConsoleKit/database\"" >>confdefs.h
+
+	session_tracking="$session_tracking, consolekit"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_session_tracking" >&5
-$as_echo "$with_session_tracking" >&6; }
+session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')"
 
 
 # Check whether --with-suspend-resume was given.
@@ -22329,11 +22733,16 @@ else
 fi
 fi
     if test "z${have_systemd_inhibit}" = "zyes"; then
-	# Use systemd if it's new enough
-	with_suspend_resume="systemd"
+        # Use systemd if it's new enough
+        with_suspend_resume="systemd"
     else
-	# Fall back to upower
-	with_suspend_resume="upower"
+        if test "$use_consolekit" = "yes"; then
+                # Use consolekit suspend if session tracking is consolekit
+                with_suspend_resume="consolekit"
+        else
+                # Fall back to upower
+                with_suspend_resume="upower"
+        fi
     fi
 fi
 
@@ -22591,9 +23000,17 @@ else
 $as_echo "yes" >&6; }
 
 fi
+
+$as_echo "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h
+
+        ;;
+    consolekit)
+
+$as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h
+
         ;;
     *)
-	as_fn_error $? "--with-suspend-resume must be one of upower, systemd" "$LINENO" 5
+        as_fn_error $? "--with-suspend-resume must be one of upower, systemd, consolekit" "$LINENO" 5
         ;;
 esac
  if test "x$with_suspend_resume" = "xupower"; then
@@ -22612,6 +23029,14 @@ else
   SUSPEND_RESUME_SYSTEMD_FALSE=
 fi
 
+ if test "x$with_suspend_resume" = "xconsolekit"; then
+  SUSPEND_RESUME_CONSOLEKIT_TRUE=
+  SUSPEND_RESUME_CONSOLEKIT_FALSE='#'
+else
+  SUSPEND_RESUME_CONSOLEKIT_TRUE='#'
+  SUSPEND_RESUME_CONSOLEKIT_FALSE=
+fi
+
 
 # SELinux support
 
@@ -22709,31 +23134,32 @@ else
 $as_echo "#define HAVE_SELINUX 0" >>confdefs.h
 
 fi
- if test "${have_selinux}" = "yes"; then
-  HAVE_SELINUX_TRUE=
-  HAVE_SELINUX_FALSE='#'
+
+# libaudit support
+
+# Check whether --with-libaudit was given.
+if test "${with_libaudit+set}" = set; then :
+  withval=$with_libaudit;
 else
-  HAVE_SELINUX_TRUE='#'
-  HAVE_SELINUX_FALSE=
+  with_libaudit=auto
 fi
 
-
-# libnl support for the linux platform
+if test "$with_libaudit" = "yes" -o "$with_libaudit" = "yes-disabled-by-default" -o "$with_libaudit" = "auto"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL" >&5
-$as_echo_n "checking for LIBNL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBAUDIT" >&5
+$as_echo_n "checking for LIBAUDIT... " >&6; }
 
-if test -n "$LIBNL_CFLAGS"; then
-    pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS"
+if test -n "$LIBAUDIT_CFLAGS"; then
+    pkg_cv_LIBAUDIT_CFLAGS="$LIBAUDIT_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 libnl-route-3.0 libnl-genl-3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audit\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "audit") 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 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null`
+  pkg_cv_LIBAUDIT_CFLAGS=`$PKG_CONFIG --cflags "audit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -22741,16 +23167,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBNL_LIBS"; then
-    pkg_cv_LIBNL_LIBS="$LIBNL_LIBS"
+if test -n "$LIBAUDIT_LIBS"; then
+    pkg_cv_LIBAUDIT_LIBS="$LIBAUDIT_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 libnl-route-3.0 libnl-genl-3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audit\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "audit") 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 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null`
+  pkg_cv_LIBAUDIT_LIBS=`$PKG_CONFIG --libs "audit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -22771,195 +23197,73 @@ 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 libnl-route-3.0 libnl-genl-3.0" 2>&1`
+	        LIBAUDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audit" 2>&1`
         else
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0" 2>&1`
+	        LIBAUDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audit" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL_PKG_ERRORS" >&5
+	echo "$LIBAUDIT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0) 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
+	have_libaudit=no
 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; }
+	have_libaudit=no
 else
-	LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS
-	LIBNL_LIBS=$pkg_cv_LIBNL_LIBS
+	LIBAUDIT_CFLAGS=$pkg_cv_LIBAUDIT_CFLAGS
+	LIBAUDIT_LIBS=$pkg_cv_LIBAUDIT_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
-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
+	have_libaudit=yes
 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"
+    if test "$with_libaudit" != "auto" -a "$have_libaudit" = "no"; then
+        as_fn_error $? "You must have libaudit installed to build --with-libaudit=$with_libaudit." "$LINENO" 5
+    fi
 else
-  ac_have_addr_gen_mode="0"
+    have_libaudit=no
 fi
+if test "$have_libaudit" = "yes"; then
 
+$as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNL_INET6_ADDR_GEN_MODE $ac_have_addr_gen_mode
-_ACEOF
+	if test "$with_libaudit" = "yes-disabled-by-default"; then
 
+$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT FALSE" >>confdefs.h
 
-{ $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
+		NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false'
+	else
 
-$as_echo "#define HAVE_KERNEL_INET6_ADDR_GEN_MODE 1" >>confdefs.h
+$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT TRUE" >>confdefs.h
 
+		NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='true'
+	fi
 else
 
-$as_echo "#define HAVE_KERNEL_INET6_ADDR_GEN_MODE 0" >>confdefs.h
+$as_echo "#define HAVE_LIBAUDIT 0" >>confdefs.h
 
-fi
 
-# IPv6 tokenized identifiers support in libnl
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rtnl_link_inet6_get_token in -lnl-route-3" >&5
-$as_echo_n "checking for rtnl_link_inet6_get_token in -lnl-route-3... " >&6; }
-if ${ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token+:} 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.  */
+$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT FALSE" >>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_token ();
-int
-main ()
-{
-return rtnl_link_inet6_get_token ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token=yes
-else
-  ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token=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_token" >&5
-$as_echo "$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" >&6; }
-if test "x$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" = xyes; then :
-  ac_have_ipv6_token="1"
-else
-  ac_have_ipv6_token="0"
+    NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false'
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNL_INET6_TOKEN $ac_have_ipv6_token
-_ACEOF
-
-
-# uuid library
+# libnl support for the linux platform
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
-$as_echo_n "checking for UUID... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL" >&5
+$as_echo_n "checking for LIBNL... " >&6; }
 
-if test -n "$UUID_CFLAGS"; then
-    pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
+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 \"uuid\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
+    { { $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_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null`
+  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
@@ -22967,16 +23271,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$UUID_LIBS"; then
-    pkg_cv_UUID_LIBS="$UUID_LIBS"
+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 \"uuid\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
+    { { $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_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null`
+  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
@@ -22997,22 +23301,22 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1`
+	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-3.0 >= 3.2.8" 2>&1`
         else
-	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1`
+	        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 "$UUID_PKG_ERRORS" >&5
+	echo "$LIBNL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (uuid) were not met:
+	as_fn_error $? "Package requirements (libnl-3.0 >= 3.2.8) were not met:
 
-$UUID_PKG_ERRORS
+$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 UUID_CFLAGS
-and UUID_LIBS to avoid the need to call 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." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -23023,208 +23327,36 @@ as_fn_error $? "The pkg-config script could not be found or is too old.  Make su
 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 UUID_CFLAGS
-and UUID_LIBS to avoid the need to call 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
-	UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
-	UUID_LIBS=$pkg_cv_UUID_LIBS
+	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
 
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
-$as_echo_n "checking for a readline compatible library... " >&6; }
-if ${ax_cv_lib_readline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    ORIG_LIBS="$LIBS"
-    for readline_lib in readline edit editline; do
-      # prefer ncurses since we use it for nmtui too
-      for termcap_lib in "" ncurses termcap curses; do
-        if test -z "$termcap_lib"; then
-          TRY_LIB="-l$readline_lib"
-        else
-          TRY_LIB="-l$readline_lib -l$termcap_lib"
-        fi
-        LIBS="$ORIG_LIBS $TRY_LIB"
-        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 readline ();
-int
-main ()
-{
-return readline ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_lib_readline="$TRY_LIB"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        if test -n "$ax_cv_lib_readline"; then
-          break
-        fi
-      done
-      if test -n "$ax_cv_lib_readline"; then
-        break
-      fi
-    done
-    LIBS="$ORIG_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5
-$as_echo "$ax_cv_lib_readline" >&6; }
-
-  if test -z "$ax_cv_lib_readline"; then
-    as_fn_error $? "readline library with terminfo support is required (one of readline, edit, or editline, AND 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 :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-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 :
-  $as_echo_n "(cached) " >&6
-else
-
-    ax_cv_lib_readline_history="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 add_history ();
-int
-main ()
-{
-return add_history ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_lib_readline_history="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_history" >&5
-$as_echo "$ax_cv_lib_readline_history" >&6; }
-  if test "$ax_cv_lib_readline_history" != "yes"; then
-    as_fn_error $? "readline history support is required" "$LINENO" 5
-  fi
-  for ac_header in history.h readline/history.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-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"
-
-
-
-# Intel WiMAX SDK checks
+# uuid library
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IWMX_SDK" >&5
-$as_echo_n "checking for IWMX_SDK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
+$as_echo_n "checking for UUID... " >&6; }
 
-if test -n "$IWMX_SDK_CFLAGS"; then
-    pkg_cv_IWMX_SDK_CFLAGS="$IWMX_SDK_CFLAGS"
+if test -n "$UUID_CFLAGS"; then
+    pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiWmxSdk-0 >= 1.5.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libiWmxSdk-0 >= 1.5.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_IWMX_SDK_CFLAGS=`$PKG_CONFIG --cflags "libiWmxSdk-0 >= 1.5.1" 2>/dev/null`
+  pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -23232,16 +23364,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$IWMX_SDK_LIBS"; then
-    pkg_cv_IWMX_SDK_LIBS="$IWMX_SDK_LIBS"
+if test -n "$UUID_LIBS"; then
+    pkg_cv_UUID_LIBS="$UUID_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiWmxSdk-0 >= 1.5.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libiWmxSdk-0 >= 1.5.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_IWMX_SDK_LIBS=`$PKG_CONFIG --libs "libiWmxSdk-0 >= 1.5.1" 2>/dev/null`
+  pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -23262,64 +23394,46 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        IWMX_SDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libiWmxSdk-0 >= 1.5.1" 2>&1`
+	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1`
         else
-	        IWMX_SDK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libiWmxSdk-0 >= 1.5.1" 2>&1`
+	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$IWMX_SDK_PKG_ERRORS" >&5
-
-	have_wimax=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_wimax=no
-else
-	IWMX_SDK_CFLAGS=$pkg_cv_IWMX_SDK_CFLAGS
-	IWMX_SDK_LIBS=$pkg_cv_IWMX_SDK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_wimax=yes
-fi
-# Check whether --enable-wimax was given.
-if test "${enable_wimax+set}" = set; then :
-  enableval=$enable_wimax; enable_wimax=${enableval}
-else
-  enable_wimax=${have_wimax}
-fi
-
-if (test "${enable_wimax}" = "yes"); then
-	if test x"$have_wimax" = x"no"; then
-		as_fn_error $? "Intel WiMAX SDK is required" "$LINENO" 5
-	fi
+	echo "$UUID_PKG_ERRORS" >&5
 
-	# Ensure the WiMAX stack is built with libnl3; otherwise crashes happen
-	# due to symbol conflicts
-	WMX_LIB_PATH=`$PKG_CONFIG --variable=libdir libiWmxSdk-0`
-	FOO=`ldd $WMX_LIB_PATH/libiWmxSdk.so.0.0.0 | grep libnl-3 2>&1`
-	if test "$?" != "0"; then
-		as_fn_error $? "Intel WiMAX stack built with incompatible libnl version!" "$LINENO" 5
-	fi
+	as_fn_error $? "Package requirements (uuid) were not met:
 
+$UUID_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 UUID_CFLAGS
+and UUID_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.
 
-$as_echo "#define WITH_WIMAX 1" >>confdefs.h
+Alternatively, you may set the environment variables UUID_CFLAGS
+and UUID_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
+	UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
+	UUID_LIBS=$pkg_cv_UUID_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-$as_echo "#define WITH_WIMAX 0" >>confdefs.h
-
-fi
- if test "${enable_wimax}" = "yes"; then
-  WITH_WIMAX_TRUE=
-  WITH_WIMAX_FALSE='#'
-else
-  WITH_WIMAX_TRUE='#'
-  WITH_WIMAX_FALSE=
 fi
 
-
 # Teamd control checks
 
 pkg_failed=no
@@ -23403,9 +23517,6 @@ if (test "${enable_teamdctl}" = "yes"); then
 	if test x"$have_teamdctl" = x"no"; then
 		as_fn_error $? "Teamd control is required" "$LINENO" 5
 	fi
-
-
-
 	# temporary bug workaround
 	LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'`
 
@@ -23543,9 +23654,6 @@ if (test "${enable_polkit_agent}" = "yes"); then
 		as_fn_error $? "Polkit agent is required" "$LINENO" 5
 	fi
 
-
-
-
 $as_echo "#define WITH_POLKIT_AGENT 1" >>confdefs.h
 
 else
@@ -23685,8 +23793,6 @@ fi
   fi
 
 
-
-
 $as_echo "#define HAVE_NSS 1" >>confdefs.h
 
   with_nss=yes
@@ -23700,12 +23806,12 @@ if test -n "$GNUTLS_CFLAGS"; then
     pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2" 2>/dev/null`
+  pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.12" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -23717,12 +23823,12 @@ if test -n "$GNUTLS_LIBS"; then
     pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2" 2>/dev/null`
+  pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.12" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -23743,14 +23849,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2" 2>&1`
+	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.12" 2>&1`
         else
-	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2" 2>&1`
+	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.12" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNUTLS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gnutls >= 1.2) were not met:
+	as_fn_error $? "Package requirements (gnutls >= 2.12) were not met:
 
 $GNUTLS_PKG_ERRORS
 
@@ -23782,59 +23888,10 @@ else
 $as_echo "yes" >&6; }
 
 fi
-  # Extract the first word of "libgcrypt-config", so it can be a program name with args.
-set dummy libgcrypt-config; 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_LIBGCRYPT_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LIBGCRYPT_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # 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_LIBGCRYPT_CONFIG="$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_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
-  ;;
-esac
-fi
-LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
-if test -n "$LIBGCRYPT_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
-$as_echo "$LIBGCRYPT_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  if test x"$LIBGCRYPT_CONFIG" = xno; then
-    as_fn_error $? "gnutls explicitly requested but gcrypt not found on system" "$LINENO" 5
-  else
 
 $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 
-    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-
-
-    with_gnutls=yes
-  fi
+  with_gnutls=yes
 else
   as_fn_error $? "Please choose either 'nss' or 'gnutls' for certificate and crypto operations" "$LINENO" 5
 fi
@@ -23994,64 +24051,6 @@ _ACEOF
 
 
 
-
-# Check whether --with-pppoe was given.
-if test "${with_pppoe+set}" = set; then :
-  withval=$with_pppoe;
-fi
-
-if test "x${with_pppoe}" = x; then
-  # Extract the first word of "pppoe", so it can be a program name with args.
-set dummy pppoe; 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_PPPOE_PATH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PPPOE_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PPPOE_PATH="$PPPOE_PATH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/sbin:/usr/sbin"
-for as_dir in $as_dummy
-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_PPPOE_PATH="$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
-PPPOE_PATH=$ac_cv_path_PPPOE_PATH
-if test -n "$PPPOE_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PPPOE_PATH" >&5
-$as_echo "$PPPOE_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-else
-  PPPOE_PATH="$with_pppoe"
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define PPPOE_PATH "$PPPOE_PATH"
-_ACEOF
-
-
-
 # ModemManager1 with libmm-glib
 
 # Check whether --with-modem-manager-1 was given.
@@ -24134,8 +24133,6 @@ $as_echo "yes" >&6; }
 	have_libmm_glib=yes
 fi
 
-
-
     if (test "${have_libmm_glib}" = "no"); then
         if (test "${with_modem_manager_1}" = "yes"); then
             as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5
@@ -24710,6 +24707,66 @@ _ACEOF
 
 
 
+# dnssec-trigger-script path
+
+# Check whether --with-dnssec_trigger was given.
+if test "${with_dnssec_trigger+set}" = set; then :
+  withval=$with_dnssec_trigger;
+fi
+
+if test "x${with_dnssec_trigger}" = x; then
+  # Extract the first word of "dnssec-trigger-script", so it can be a program name with args.
+set dummy dnssec-trigger-script; 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_DNSSEC_TRIGGER_SCRIPT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DNSSEC_TRIGGER_SCRIPT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DNSSEC_TRIGGER_SCRIPT="$DNSSEC_TRIGGER_SCRIPT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="/usr/local/libexec:/usr/local/lib:/usr/local/lib/dnssec-trigger:/usr/libexec:/usr/lib:/usr/lib/dnssec-trigger"
+for as_dir in $as_dummy
+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_DNSSEC_TRIGGER_SCRIPT="$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_DNSSEC_TRIGGER_SCRIPT" && ac_cv_path_DNSSEC_TRIGGER_SCRIPT="/usr/libexec/dnssec-trigger-script"
+  ;;
+esac
+fi
+DNSSEC_TRIGGER_SCRIPT=$ac_cv_path_DNSSEC_TRIGGER_SCRIPT
+if test -n "$DNSSEC_TRIGGER_SCRIPT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSSEC_TRIGGER_SCRIPT" >&5
+$as_echo "$DNSSEC_TRIGGER_SCRIPT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+else
+  DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define DNSSEC_TRIGGER_SCRIPT "$DNSSEC_TRIGGER_SCRIPT"
+_ACEOF
+
+
+
 # system CA certificates path
 
 # Check whether --with-system-ca-path was given.
@@ -24862,8 +24919,6 @@ if (test "${enable_concheck}" = "yes"); then
 		as_fn_error $? "Connectivity checking requires libsoup" "$LINENO" 5
 	fi
 
-
-
 $as_echo "#define WITH_CONCHECK 1" >>confdefs.h
 
 else
@@ -24973,6 +25028,195 @@ $as_echo "yes" >&6; }
 fi
 
 
+# Check whether --with-nmcli was given.
+if test "${with_nmcli+set}" = set; then :
+  withval=$with_nmcli;
+fi
+
+if test "$with_nmcli" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
+$as_echo_n "checking for a readline compatible library... " >&6; }
+if ${ax_cv_lib_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ORIG_LIBS="$LIBS"
+    for readline_lib in readline edit editline; do
+      # prefer ncurses since we use it for nmtui too
+      for termcap_lib in "" ncurses termcap curses; do
+        if test -z "$termcap_lib"; then
+          TRY_LIB="-l$readline_lib"
+        else
+          TRY_LIB="-l$readline_lib -l$termcap_lib"
+        fi
+        LIBS="$ORIG_LIBS $TRY_LIB"
+        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 readline ();
+int
+main ()
+{
+return readline ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_lib_readline="$TRY_LIB"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        if test -n "$ax_cv_lib_readline"; then
+          break
+        fi
+      done
+      if test -n "$ax_cv_lib_readline"; then
+        break
+      fi
+    done
+    LIBS="$ORIG_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5
+$as_echo "$ax_cv_lib_readline" >&6; }
+
+  if test -z "$ax_cv_lib_readline"; then
+    as_fn_error $? "readline library with terminfo support is required (one of readline, edit, or editline, AND 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 :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+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 :
+  $as_echo_n "(cached) " >&6
+else
+
+    ax_cv_lib_readline_history="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 add_history ();
+int
+main ()
+{
+return add_history ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_lib_readline_history="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_history" >&5
+$as_echo "$ax_cv_lib_readline_history" >&6; }
+  if test "$ax_cv_lib_readline_history" != "yes"; then
+    as_fn_error $? "readline history support is required" "$LINENO" 5
+  fi
+  for ac_header in history.h readline/history.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+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"
+
+
+    build_nmcli=yes
+else
+    build_nmcli=no
+fi
+ if test "$build_nmcli" = yes; then
+  BUILD_NMCLI_TRUE=
+  BUILD_NMCLI_FALSE='#'
+else
+  BUILD_NMCLI_TRUE='#'
+  BUILD_NMCLI_FALSE=
+fi
+
+
+
 # Check whether --with-nmtui was given.
 if test "${with_nmtui+set}" = set; then :
   withval=$with_nmtui;
@@ -25405,12 +25649,29 @@ if test "${enable_more_asserts+set}" = set; then :
   enableval=$enable_more_asserts;
 fi
 
+more_asserts=0
 if test "${enable_more_asserts}" = "yes"; then
+    more_asserts=100
+fi
 
-$as_echo "#define NM_MORE_ASSERTS 1" >>confdefs.h
+# Check whether --with-more-asserts was given.
+if test "${with_more_asserts+set}" = set; then :
+  withval=$with_more_asserts; more_asserts=${with_more_asserts}
+fi
 
+if test "${more_asserts}" = "no"; then
+    more_asserts=0
+else
+    if test "${more_asserts}" = "yes"; then
+        more_asserts=100
+    fi
 fi
 
+cat >>confdefs.h <<_ACEOF
+#define NM_MORE_ASSERTS $more_asserts
+_ACEOF
+
+
 # Check whether --enable-more-logging was given.
 if test "${enable_more_logging+set}" = set; then :
   enableval=$enable_more_logging;
@@ -26295,7 +26556,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version-macros.h 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/supplicant-manager/tests/certs/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/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc 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"
+ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h 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/supplicant-manager/tests/certs/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/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc 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 introspection/Makefile introspection/all.xml man/Makefile 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/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile"
 
 
 
@@ -26459,10 +26720,6 @@ if test -z "${CONFIG_PLUGIN_IFCFG_RH_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_RH
   as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_RH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${CONFIG_PLUGIN_IFCFG_SUSE_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_SUSE_FALSE}"; then
-  as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_SUSE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${CONFIG_PLUGIN_IFUPDOWN_TRUE}" && test -z "${CONFIG_PLUGIN_IFUPDOWN_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_PLUGIN_IFUPDOWN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26483,8 +26740,8 @@ 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 "${HAVE_DBUS_GLIB_100_TRUE}" && test -z "${HAVE_DBUS_GLIB_100_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_DBUS_GLIB_100\" was never defined.
+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 "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
@@ -26507,14 +26764,6 @@ 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 "${SESSION_TRACKING_CK_TRUE}" && test -z "${SESSION_TRACKING_CK_FALSE}"; then
-  as_fn_error $? "conditional \"SESSION_TRACKING_CK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${SESSION_TRACKING_SYSTEMD_TRUE}" && test -z "${SESSION_TRACKING_SYSTEMD_FALSE}"; then
-  as_fn_error $? "conditional \"SESSION_TRACKING_SYSTEMD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${SUSPEND_RESUME_UPOWER_TRUE}" && test -z "${SUSPEND_RESUME_UPOWER_FALSE}"; then
   as_fn_error $? "conditional \"SUSPEND_RESUME_UPOWER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26523,12 +26772,8 @@ if test -z "${SUSPEND_RESUME_SYSTEMD_TRUE}" && test -z "${SUSPEND_RESUME_SYSTEMD
   as_fn_error $? "conditional \"SUSPEND_RESUME_SYSTEMD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${WITH_WIMAX_TRUE}" && test -z "${WITH_WIMAX_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_WIMAX\" was never defined.
+if test -z "${SUSPEND_RESUME_CONSOLEKIT_TRUE}" && test -z "${SUSPEND_RESUME_CONSOLEKIT_FALSE}"; then
+  as_fn_error $? "conditional \"SUSPEND_RESUME_CONSOLEKIT\" 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
@@ -26567,6 +26812,10 @@ 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
+fi
 if test -z "${BUILD_NMTUI_TRUE}" && test -z "${BUILD_NMTUI_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_NMTUI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27020,7 +27269,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.0.10, which was
+This file was extended by NetworkManager $as_me 1.1.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27086,7 +27335,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.0.10
+NetworkManager config.status 1.1.90
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -27608,8 +27857,8 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "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-macros.h") CONFIG_FILES="$CONFIG_FILES include/nm-version-macros.h" ;;
+    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
+    "shared/nm-version-macros.h") CONFIG_FILES="$CONFIG_FILES shared/nm-version-macros.h" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
     "src/tests/config/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/config/Makefile" ;;
@@ -27629,17 +27878,16 @@ do
     "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/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" ;;
     "src/rdisc/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/rdisc/tests/Makefile" ;;
+    "src/devices/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/Makefile" ;;
+    "src/devices/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/tests/Makefile" ;;
     "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" ;;
@@ -27664,17 +27912,9 @@ do
     "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" ;;
-    "initscript/SUSE/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/SUSE/networkmanager" ;;
-    "initscript/Arch/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Arch/networkmanager" ;;
-    "initscript/Mandriva/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Mandriva/networkmanager" ;;
-    "initscript/linexa/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/linexa/networkmanager" ;;
     "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" ;;
@@ -27698,7 +27938,10 @@ do
     "examples/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/Makefile" ;;
     "examples/python/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/dbus/Makefile" ;;
     "examples/python/gi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/gi/Makefile" ;;
+    "examples/python/python-networkmanager/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/python-networkmanager/Makefile" ;;
     "examples/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES examples/ruby/Makefile" ;;
+    "examples/lua/Makefile") CONFIG_FILES="$CONFIG_FILES examples/lua/Makefile" ;;
+    "examples/lua/lgi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/lua/lgi/Makefile" ;;
     "examples/C/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/Makefile" ;;
     "examples/C/glib/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/glib/Makefile" ;;
     "examples/C/qt/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/qt/Makefile" ;;
@@ -29428,42 +29671,46 @@ echo "  exec_prefix: $exec_prefix"
 echo "  systemdunitdir: $with_systemdsystemunitdir"
 echo "  nmbinary: $nmbinary"
 echo "  nmconfdir: $nmconfdir"
+echo "  nmlibdir: $nmlibdir"
 echo "  nmdatadir: $nmdatadir"
 echo "  nmstatedir: $nmstatedir"
 echo "  nmrundir: $nmrundir"
 echo
 
 echo "Platform:"
-echo "  session tracking: $with_session_tracking"
+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=${enable_polkit})"
+		echo "  policykit: yes (permissive modify.system) (default: main.auth-polkit=${enable_polkit})"
 	else
-		echo "  policykit: yes (restrictive modify.system) (default=${enable_polkit})"
+		echo "  policykit: yes (restrictive modify.system) (default: main.auth-polkit=${enable_polkit})"
 	fi
 else
 	echo  "  policykit: no"
 fi
 echo "  polkit agent: ${enable_polkit_agent}"
 echo "  selinux: $have_selinux"
+echo "  systemd-journald: $have_systemd_journal (default: logging.backend=${nm_config_logging_backend_default})"
+echo "  hostname persist: ${hostname_persist}"
+echo "  libaudit: $have_libaudit (default: logging.audit=${NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT})"
 echo
 
 echo "Features:"
 echo "  wext: $ac_with_wext"
 echo "  wifi: $enable_wifi"
-echo "  wimax: $enable_wimax"
 echo "  ppp: $enable_ppp"
 echo "  modemmanager-1: $with_modem_manager_1"
 echo "  concheck: $enable_concheck"
 echo "  libteamdctl: $enable_teamdctl"
+echo "  libnm-glib: $with_libnm_glib"
+echo "  nmcli: $build_nmcli"
 echo "  nmtui: $build_nmtui"
 echo
 
 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}"
 echo "  ifnet: ${enable_ifnet}"
 echo
@@ -29481,6 +29728,7 @@ echo
 echo "Miscellaneous:"
 echo "  documentation: $enable_gtk_doc"
 echo "  tests: $enable_tests"
+echo "  more-asserts: $more_asserts"
 echo "  valgrind: $with_valgrind   $with_valgrind_suppressions"
 echo "  code coverage: $enable_code_coverage"
 echo "  LTO: $enable_lto"