New upstream version 1.8.0 upstream/1.8.0

1 files changed, 1375 insertions, 718 deletions

diff --git a/configure b/configure
index ad6974b6..81af3511 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.6.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.8.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.6.2'
-PACKAGE_STRING='NetworkManager 1.6.2'
+PACKAGE_VERSION='1.8.0'
+PACKAGE_STRING='NetworkManager 1.8.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -637,24 +637,12 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-SETTING_DOCS_AVAILABLE_FALSE
-SETTING_DOCS_AVAILABLE_TRUE
-BUILD_SETTING_DOCS_FALSE
-BUILD_SETTING_DOCS_TRUE
+HAVE_DOCS_FALSE
+HAVE_DOCS_TRUE
+BUILD_DOCS_FALSE
+BUILD_DOCS_TRUE
 XSLTPROC
 PERL
-BINUTILS_NM
-pkgpyexecdir
-pyexecdir
-pkgpythondir
-pythondir
-PYTHON_PLATFORM
-PYTHON_EXEC_PREFIX
-PYTHON_PREFIX
-PYTHON_VERSION
-PYTHON
-INSTALL_PREGEN_MANPAGES_FALSE
-INSTALL_PREGEN_MANPAGES_TRUE
 GTK_DOC_USE_REBASE_FALSE
 GTK_DOC_USE_REBASE_TRUE
 GTK_DOC_USE_LIBTOOL_FALSE
@@ -674,6 +662,16 @@ GTKDOC_MKPDF
 GTKDOC_REBASE
 GTKDOC_CHECK_PATH
 GTKDOC_CHECK
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_PLATFORM
+PYTHON_EXEC_PREFIX
+PYTHON_PREFIX
+PYTHON_VERSION
+PYTHON
+BINUTILS_NM
 NM_LOG_COMPILER
 REQUIRE_ROOT_TESTS_FALSE
 REQUIRE_ROOT_TESTS_TRUE
@@ -698,10 +696,12 @@ LIBNDP_LIBS
 LIBNDP_CFLAGS
 WITH_CONCHECK_FALSE
 WITH_CONCHECK_TRUE
-WITH_LIBSOUP_FALSE
-WITH_LIBSOUP_TRUE
-LIBSOUP_LIBS
-LIBSOUP_CFLAGS
+LIBCURL_LIBS
+LIBCURL_CFLAGS
+WITH_LIBPSL_FALSE
+WITH_LIBPSL_TRUE
+LIBPSL_LIBS
+LIBPSL_CFLAGS
 KERNEL_FIRMWARE_DIR
 SYSTEM_CA_PATH
 DNSSEC_TRIGGER_SCRIPT
@@ -747,12 +747,14 @@ WITH_POLKIT_AGENT_TRUE
 POLKIT_LIBS
 POLKIT_CFLAGS
 NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT
-JANSSON_LIBS
-JANSSON_CFLAGS
+WITH_JANSSON_FALSE
+WITH_JANSSON_TRUE
 WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
 LIBTEAMDCTL_LIBS
 LIBTEAMDCTL_CFLAGS
+JANSSON_LIBS
+JANSSON_CFLAGS
 UUID_LIBS
 UUID_CFLAGS
 LIBNL_LIBS
@@ -762,6 +764,8 @@ LIBAUDIT_LIBS
 LIBAUDIT_CFLAGS
 SELINUX_LIBS
 SELINUX_CFLAGS
+ELOGIND_INHIBIT_LIBS
+ELOGIND_INHIBIT_CFLAGS
 SYSTEMD_INHIBIT_LIBS
 SYSTEMD_INHIBIT_CFLAGS
 SYSTEMD_LOGIN_LIBS
@@ -796,8 +800,8 @@ INTROSPECTION_GIRDIR
 INTROSPECTION_GENERATE
 INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
-GUDEV_LIBS
-GUDEV_CFLAGS
+LIBUDEV_LIBS
+LIBUDEV_CFLAGS
 WITH_LEGACY_LIBRARIES_FALSE
 WITH_LEGACY_LIBRARIES_TRUE
 DBUS_LIBS
@@ -810,7 +814,6 @@ PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 DL_LIBS
-LIBM
 WITH_WEXT_FALSE
 WITH_WEXT_TRUE
 WITH_WIFI_FALSE
@@ -1082,7 +1085,7 @@ with_dnsmasq
 with_dnssec_trigger
 with_system_ca_path
 with_kernel_firmware_dir
-with_libsoup
+with_libpsl
 enable_concheck
 with_nmcli
 with_nmtui
@@ -1125,8 +1128,8 @@ GLIB_CFLAGS
 GLIB_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
-GUDEV_CFLAGS
-GUDEV_LIBS
+LIBUDEV_CFLAGS
+LIBUDEV_LIBS
 QT_CFLAGS
 QT_LIBS
 SYSTEMD_200_CFLAGS
@@ -1139,6 +1142,8 @@ SYSTEMD_LOGIN_CFLAGS
 SYSTEMD_LOGIN_LIBS
 SYSTEMD_INHIBIT_CFLAGS
 SYSTEMD_INHIBIT_LIBS
+ELOGIND_INHIBIT_CFLAGS
+ELOGIND_INHIBIT_LIBS
 SELINUX_CFLAGS
 SELINUX_LIBS
 LIBAUDIT_CFLAGS
@@ -1147,10 +1152,10 @@ LIBNL_CFLAGS
 LIBNL_LIBS
 UUID_CFLAGS
 UUID_LIBS
-LIBTEAMDCTL_CFLAGS
-LIBTEAMDCTL_LIBS
 JANSSON_CFLAGS
 JANSSON_LIBS
+LIBTEAMDCTL_CFLAGS
+LIBTEAMDCTL_LIBS
 POLKIT_CFLAGS
 POLKIT_LIBS
 NSS_CFLAGS
@@ -1161,15 +1166,17 @@ MM_GLIB_CFLAGS
 MM_GLIB_LIBS
 BLUEZ5_CFLAGS
 BLUEZ5_LIBS
-LIBSOUP_CFLAGS
-LIBSOUP_LIBS
+LIBPSL_CFLAGS
+LIBPSL_LIBS
+LIBCURL_CFLAGS
+LIBCURL_LIBS
 LIBNDP_CFLAGS
 LIBNDP_LIBS
 NEWT_CFLAGS
 NEWT_LIBS
+PYTHON
 GTKDOC_DEPS_CFLAGS
-GTKDOC_DEPS_LIBS
-PYTHON'
+GTKDOC_DEPS_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1710,7 +1717,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.6.2 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1780,7 +1787,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.6.2:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1889,10 +1896,10 @@ Optional Packages:
                           Support systemd session tracking
   --with-consolekit=yes|no
                           Support consolekit session tracking
-  --with-session-tracking=systemd|consolekit|no
+  --with-session-tracking=systemd|elogind|consolekit|no
                           Compatibility option to choose one session tracking
                           module
-  --with-suspend-resume=upower|systemd|consolekit
+  --with-suspend-resume=upower|systemd|elogind|consolekit
                           Build NetworkManager with specific suspend/resume
                           support
   --with-selinux=yes|no|auto
@@ -1938,7 +1945,7 @@ Optional Packages:
   --with-kernel-firmware-dir=DIR
                           where kernel firmware directory is (default is
                           /lib/firmware)
-  --with-libsoup=yes|no   Link against libsoup
+  --with-libpsl=yes|no    Link against libpsl
   --with-nmcli=yes|no     Build nmcli
   --with-nmtui=yes|no     Build nmtui
   --with-more-asserts=level
@@ -1974,9 +1981,10 @@ Some influential environment variables:
   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
+  LIBUDEV_CFLAGS
+              C compiler flags for LIBUDEV, overriding pkg-config
+  LIBUDEV_LIBS
+              linker flags for LIBUDEV, overriding pkg-config
   QT_CFLAGS   C compiler flags for QT, overriding pkg-config
   QT_LIBS     linker flags for QT, overriding pkg-config
   SYSTEMD_200_CFLAGS
@@ -1999,6 +2007,10 @@ Some influential environment variables:
               C compiler flags for SYSTEMD_INHIBIT, overriding pkg-config
   SYSTEMD_INHIBIT_LIBS
               linker flags for SYSTEMD_INHIBIT, overriding pkg-config
+  ELOGIND_INHIBIT_CFLAGS
+              C compiler flags for ELOGIND_INHIBIT, overriding pkg-config
+  ELOGIND_INHIBIT_LIBS
+              linker flags for ELOGIND_INHIBIT, overriding pkg-config
   SELINUX_CFLAGS
               C compiler flags for SELINUX, overriding pkg-config
   SELINUX_LIBS
@@ -2012,14 +2024,14 @@ Some influential environment variables:
   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
-  LIBTEAMDCTL_CFLAGS
-              C compiler flags for LIBTEAMDCTL, overriding pkg-config
-  LIBTEAMDCTL_LIBS
-              linker flags for LIBTEAMDCTL, overriding pkg-config
   JANSSON_CFLAGS
               C compiler flags for JANSSON, overriding pkg-config
   JANSSON_LIBS
               linker flags for JANSSON, overriding pkg-config
+  LIBTEAMDCTL_CFLAGS
+              C compiler flags for LIBTEAMDCTL, overriding pkg-config
+  LIBTEAMDCTL_LIBS
+              linker flags for LIBTEAMDCTL, overriding pkg-config
   POLKIT_CFLAGS
               C compiler flags for POLKIT, overriding pkg-config
   POLKIT_LIBS linker flags for POLKIT, overriding pkg-config
@@ -2035,20 +2047,23 @@ Some influential environment variables:
   BLUEZ5_CFLAGS
               C compiler flags for BLUEZ5, overriding pkg-config
   BLUEZ5_LIBS linker flags for BLUEZ5, overriding pkg-config
-  LIBSOUP_CFLAGS
-              C compiler flags for LIBSOUP, overriding pkg-config
-  LIBSOUP_LIBS
-              linker flags for LIBSOUP, overriding pkg-config
+  LIBPSL_CFLAGS
+              C compiler flags for LIBPSL, overriding pkg-config
+  LIBPSL_LIBS linker flags for LIBPSL, overriding pkg-config
+  LIBCURL_CFLAGS
+              C compiler flags for LIBCURL, overriding pkg-config
+  LIBCURL_LIBS
+              linker flags for LIBCURL, overriding pkg-config
   LIBNDP_CFLAGS
               C compiler flags for LIBNDP, overriding pkg-config
   LIBNDP_LIBS linker flags for LIBNDP, overriding pkg-config
   NEWT_CFLAGS C compiler flags for NEWT, overriding pkg-config
   NEWT_LIBS   linker flags for NEWT, overriding pkg-config
+  PYTHON      the Python interpreter
   GTKDOC_DEPS_CFLAGS
               C compiler flags for GTKDOC_DEPS, overriding pkg-config
   GTKDOC_DEPS_LIBS
               linker flags for GTKDOC_DEPS, overriding pkg-config
-  PYTHON      the Python interpreter
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2116,7 +2131,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.6.2
+NetworkManager configure 1.8.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2839,11 +2854,57 @@ rm -f conftest.val
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
 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.6.2, which was
+It was created by NetworkManager $as_me 1.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3713,7 +3774,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.6.2'
+ VERSION='1.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6610,6 +6671,7 @@ $as_echo "no, using $LN_S" >&6; }
 fi
 
 
+
 # Prefer gcc-* variants; the ones libtool would choose don't work with LTO
 if test -n "$ac_tool_prefix"; then
   for ac_prog in gcc-ar ar
@@ -17795,9 +17857,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=6
-NM_MICRO_VERSION=2
-NM_VERSION=1.6.2
+NM_MINOR_VERSION=8
+NM_MICRO_VERSION=0
+NM_VERSION=1.8.0
 
 
 
@@ -17805,7 +17867,7 @@ NM_VERSION=1.6.2
 
 
 
-NM_GIT_SHA=cef2c19623951b7454205ab83f8860b7b5cdd774
+NM_GIT_SHA=9c3df9caa3296a55fe54e6aa02fe8a11b27deaba
 
 if test """" != "no-config-h" ; then
 
@@ -17860,6 +17922,54 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
+$as_echo_n "checking size of time_t... " >&6; }
+if ${ac_cv_sizeof_time_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_time_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 (time_t)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_time_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
+$as_echo "$ac_cv_sizeof_time_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
+_ACEOF
+
+
+
+ac_fn_c_check_decl "$LINENO" "explicit_bzero" "ac_cv_have_decl_explicit_bzero" "
+#include <string.h>
+
+"
+if test "x$ac_cv_have_decl_explicit_bzero" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_EXPLICIT_BZERO $ac_have_decl
+_ACEOF
+
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
@@ -21203,7 +21313,7 @@ $as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6;
 int
 main ()
 {
-unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++;
+unsigned a = NL80211_CMD_CRIT_PROTOCOL_START; a++;
   ;
   return 0;
 }
@@ -21242,7 +21352,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 int
 main ()
 {
-unsigned int a = VLAN_FLAG_LOOSE_BINDING;
+unsigned a = VLAN_FLAG_LOOSE_BINDING;
   ;
   return 0;
 }
@@ -21265,139 +21375,6 @@ $as_echo "#define HAVE_VLAN_FLAG_LOOSE_BINDING 0" >>confdefs.h
 
 fi
 
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
-$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
-if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmw  $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 _mwvalidcheckl ();
-int
-main ()
-{
-return _mwvalidcheckl ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mw__mwvalidcheckl=yes
-else
-  ac_cv_lib_mw__mwvalidcheckl=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_mw__mwvalidcheckl" >&5
-$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
-if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then :
-  LIBM=-lmw
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $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 cos ();
-int
-main ()
-{
-return cos ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_cos=yes
-else
-  ac_cv_lib_m_cos=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_m_cos" >&5
-$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
-  LIBM="$LIBM -lm"
-fi
-
-  ;;
-*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $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 cos ();
-int
-main ()
-{
-return cos ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_cos=yes
-else
-  ac_cv_lib_m_cos=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_m_cos" >&5
-$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
-  LIBM=-lm
-fi
-
-  ;;
-esac
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
 if ${ac_cv_search_dlopen+:} false; then :
@@ -21944,19 +21921,19 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5
-$as_echo_n "checking for GUDEV... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5
+$as_echo_n "checking for LIBUDEV... " >&6; }
 
-if test -n "$GUDEV_CFLAGS"; then
-    pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS"
+if test -n "$LIBUDEV_CFLAGS"; then
+    pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libudev >= 175") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 165" 2>/dev/null`
+  pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 175" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21964,16 +21941,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$GUDEV_LIBS"; then
-    pkg_cv_GUDEV_LIBS="$GUDEV_LIBS"
+if test -n "$LIBUDEV_LIBS"; then
+    pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libudev >= 175") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 165" 2>/dev/null`
+  pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 175" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21994,22 +21971,22 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-1.0 >= 165" 2>&1`
+	        LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 175" 2>&1`
         else
-	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-1.0 >= 165" 2>&1`
+	        LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 175" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GUDEV_PKG_ERRORS" >&5
+	echo "$LIBUDEV_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gudev-1.0 >= 165) were not met:
+	as_fn_error $? "Package requirements (libudev >= 175) were not met:
 
-$GUDEV_PKG_ERRORS
+$LIBUDEV_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 GUDEV_CFLAGS
-and GUDEV_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBUDEV_CFLAGS
+and LIBUDEV_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
@@ -22020,15 +21997,15 @@ 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 GUDEV_CFLAGS
-and GUDEV_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBUDEV_CFLAGS
+and LIBUDEV_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
-	GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS
-	GUDEV_LIBS=$pkg_cv_GUDEV_LIBS
+	LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS
+	LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -22824,19 +22801,22 @@ fi
 
 # backwards compatibility
 if test "$with_session_tracking" = "ck"; then :
-  use_consolekit="yes" use_systemd_logind="no"
+  use_consolekit="yes" use_systemd_logind="no" use_elogind="no"
 fi
 if test "$with_session_tracking" = "consolekit"; then :
-  use_consolekit="yes" use_systemd_logind="no"
+  use_consolekit="yes" use_systemd_logind="no" use_elogind="no"
 fi
 if test "$with_session_tracking" = "systemd"; then :
-  use_consolekit="no" use_systemd_logind="yes"
+  use_consolekit="no" use_systemd_logind="yes" use_elogind="no"
+fi
+if test "$with_session_tracking" = "elogind"; then :
+  use_consolekit="no" use_systemd_logind="no" use_elogind="yes"
 fi
 if test "$with_session_tracking" = "no"; then :
-  use_consolekit="no" use_systemd_logind="no"
+  use_consolekit="no" use_systemd_logind="no" use_elogind="no"
 fi
 if test "$with_session_tracking" = "none"; then :
-  use_consolekit="no" use_systemd_logind="no"
+  use_consolekit="no" use_systemd_logind="no" use_elogind="no"
 fi
 # current options
 if test -n "$with_systemd_logind" ; then :
@@ -23076,8 +23056,237 @@ if test "$have_systemd_logind" = "yes"; then
 
 $as_echo "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h
 
-	session_tracking="$session_tracking, systemd-logind"
+    session_tracking="$session_tracking, systemd-logind"
+fi
+
+if test "$use_elogind" = "yes" -a "$have_systemd_logind" = "yes"; then
+    as_fn_error $? "Cannot enable systemd-logind together with elogind." "$LINENO" 5
+fi
+if test "$use_elogind" = "yes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5
+$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; }
+
+if test -n "$SYSTEMD_LOGIN_CFLAGS"; then
+    pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LOGIN_LIBS"; then
+    pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1`
+        else
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5
+$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; }
+
+if test -n "$SYSTEMD_LOGIN_CFLAGS"; then
+    pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LOGIN_LIBS"; then
+    pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1`
+        else
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5
+
+	have_elogind=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_elogind=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_elogind=yes
+fi
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5
+$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; }
+
+if test -n "$SYSTEMD_LOGIN_CFLAGS"; then
+    pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LOGIN_LIBS"; then
+    pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1`
+        else
+	        SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5
+
+	have_elogind=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_elogind=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_elogind=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_elogind=yes
+fi
+else
+    have_elogind=no
+fi
+if test "$use_elogind" = "yes" -a "$have_elogind" = "no"; then
+    as_fn_error $? "You must have libelogind installed to build with elogind support." "$LINENO" 5
+fi
+if test "$have_elogind" = "yes"; then
+
+$as_echo "#define SESSION_TRACKING_ELOGIND 1" >>confdefs.h
+
+    session_tracking="$session_tracking, elogind"
+fi
+
 if test "$use_consolekit" = "yes"; then
 
 $as_echo "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h
@@ -23119,6 +23328,29 @@ fi
         # Use systemd if it's new enough
         with_suspend_resume="systemd"
     else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_elogind_inhibit=yes
+else
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_elogind_inhibit=yes
+else
+  have_elogind_inhibit=no
+fi
+fi
+        if test "z${have_elogind_inhibit}" = "zyes"; then
+            # Use elogind if it's new enough
+            with_suspend_resume="elogind"
+        else
         if test "$use_consolekit" = "yes"; then
                 # Use consolekit suspend if session tracking is consolekit
                 with_suspend_resume="consolekit"
@@ -23128,6 +23360,7 @@ fi
         fi
     fi
 fi
+fi
 
 case $with_suspend_resume in
     upower)
@@ -23391,13 +23624,269 @@ fi
 $as_echo "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h
 
         ;;
+    elogind)
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5
+$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; }
+
+if test -n "$ELOGIND_INHIBIT_CFLAGS"; then
+    pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$ELOGIND_INHIBIT_LIBS"; then
+    pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 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
+	        ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1`
+        else
+	        ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5
+$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; }
+
+if test -n "$ELOGIND_INHIBIT_CFLAGS"; then
+    pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$ELOGIND_INHIBIT_LIBS"; then
+    pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 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
+	        ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1`
+        else
+	        ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libelogind >= 219) were not met:
+
+$ELOGIND_INHIBIT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS
+and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS
+and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS
+	ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5
+$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; }
+
+if test -n "$ELOGIND_INHIBIT_CFLAGS"; then
+    pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$ELOGIND_INHIBIT_LIBS"; then
+    pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 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
+	        ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind >= 219" 2>&1`
+        else
+	        ELOGIND_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind >= 219" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$ELOGIND_INHIBIT_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libelogind >= 219) were not met:
+
+$ELOGIND_INHIBIT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS
+and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS
+and ELOGIND_INHIBIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS
+	ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+else
+	ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS
+	ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+$as_echo "#define SUSPEND_RESUME_ELOGIND 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, consolekit" "$LINENO" 5
+        as_fn_error $? "--with-suspend-resume must be one of upower, systemd, elogind, consolekit" "$LINENO" 5
         ;;
 esac
 
@@ -23799,6 +24288,78 @@ fi
 
 # Teamd control checks
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
+$as_echo_n "checking for JANSSON... " >&6; }
+
+if test -n "$JANSSON_CFLAGS"; then
+    pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$JANSSON_LIBS"; then
+    pkg_cv_JANSSON_LIBS="$JANSSON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null`
+		      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
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1`
+        else
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$JANSSON_PKG_ERRORS" >&5
+
+	have_jansson=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_jansson=no
+else
+	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
+	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_jansson=yes
+fi
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5
 $as_echo_n "checking for LIBTEAMDCTL... " >&6; }
@@ -23869,16 +24430,25 @@ else
 $as_echo "yes" >&6; }
 	have_teamdctl=yes
 fi
+if test "$have_jansson" = "yes" -a "$have_teamdctl" = "yes"; then
+	have_team_prereq=yes
+else
+	have_team_prereq=no
+fi
+
 # Check whether --enable-teamdctl was given.
 if test "${enable_teamdctl+set}" = set; then :
   enableval=$enable_teamdctl; enable_teamdctl=${enableval}
 else
-  enable_teamdctl=${have_teamdctl}
+  enable_teamdctl=${have_team_prereq}
 fi
 
 if (test "${enable_teamdctl}" = "yes"); then
-	if test x"$have_teamdctl" = x"no"; then
-		as_fn_error $? "Teamd control is required" "$LINENO" 5
+	if test "$have_teamdctl" = "no"; then
+		as_fn_error $? "Libteamdctl is required for team support" "$LINENO" 5
+	fi
+	if test "$have_jansson" = "no"; then
+		as_fn_error $? "Jansson is required for team support" "$LINENO" 5
 	fi
 	# temporary bug workaround
 	LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'`
@@ -23902,7 +24472,9 @@ fi
 # Jansson for team configuration validation
 # Check whether --enable-json-validation was given.
 if test "${enable_json_validation+set}" = set; then :
-  enableval=$enable_json_validation;
+  enableval=$enable_json_validation; enable_json_validation=${enableval}
+else
+  enable_json_validation=${have_jansson}
 fi
 
 if (test "${enable_json_validation}" == "no"); then
@@ -23910,81 +24482,21 @@ if (test "${enable_json_validation}" == "no"); then
 $as_echo "#define WITH_JANSSON 0" >>confdefs.h
 
 else
+    if test "$have_jansson" = "no"; then
+        as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5
+    fi
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
-$as_echo_n "checking for JANSSON... " >&6; }
-
-if test -n "$JANSSON_CFLAGS"; then
-    pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$JANSSON_LIBS"; then
-    pkg_cv_JANSSON_LIBS="$JANSSON_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null`
-		      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; }
+$as_echo "#define WITH_JANSSON 1" >>confdefs.h
 
-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
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1`
-        else
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JANSSON_PKG_ERRORS" >&5
-
-	as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5
+ if test "${enable_json_validation}" != "no"; then
+  WITH_JANSSON_TRUE=
+  WITH_JANSSON_FALSE='#'
 else
-	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
-	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
+  WITH_JANSSON_TRUE='#'
+  WITH_JANSSON_FALSE=
 fi
 
-$as_echo "#define WITH_JANSSON 1" >>confdefs.h
-
-fi
 
 # we usually compile with polkit support. --enable-polkit=yes|no only sets the
 # default configuration for main.auth-polkit. User can always enable/disable polkit
@@ -25371,19 +25883,19 @@ _ACEOF
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
-$as_echo_n "checking for LIBSOUP... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5
+$as_echo_n "checking for LIBPSL... " >&6; }
 
-if test -n "$LIBSOUP_CFLAGS"; then
-    pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
+if test -n "$LIBPSL_CFLAGS"; then
+    pkg_cv_LIBPSL_CFLAGS="$LIBPSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.40\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.40") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpsl >= 0.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.40" 2>/dev/null`
+  pkg_cv_LIBPSL_CFLAGS=`$PKG_CONFIG --cflags "libpsl >= 0.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -25391,16 +25903,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBSOUP_LIBS"; then
-    pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
+if test -n "$LIBPSL_LIBS"; then
+    pkg_cv_LIBPSL_LIBS="$LIBPSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.40\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.40") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpsl >= 0.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.40" 2>/dev/null`
+  pkg_cv_LIBPSL_LIBS=`$PKG_CONFIG --libs "libpsl >= 0.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -25421,71 +25933,142 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.40" 2>&1`
+	        LIBPSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpsl >= 0.1" 2>&1`
         else
-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.40" 2>&1`
+	        LIBPSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpsl >= 0.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBSOUP_PKG_ERRORS" >&5
+	echo "$LIBPSL_PKG_ERRORS" >&5
 
-	have_libsoup=no
+	have_libpsl=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_libsoup=no
+	have_libpsl=no
 else
-	LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
-	LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
+	LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS
+	LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_libsoup=yes
+	have_libpsl=yes
 fi
 
-# Check whether --with-libsoup was given.
-if test "${with_libsoup+set}" = set; then :
-  withval=$with_libsoup;
+# Check whether --with-libpsl was given.
+if test "${with_libpsl+set}" = set; then :
+  withval=$with_libpsl;
 else
-  with_libsoup=${have_libsoup}
+  with_libpsl=${have_libpsl}
 fi
 
-if test "$with_libsoup" != "no"; then
-	if test "$have_libsoup" != "yes"; then
-		as_fn_error $? "libsoup library not found" "$LINENO" 5
+if test "$with_libpsl" != "no"; then
+	if test "$have_libpsl" != "yes"; then
+		as_fn_error $? "libpsl library not found" "$LINENO" 5
 	fi
-	with_libsoup='yes'
+	with_libpsl='yes'
 
-$as_echo "#define WITH_LIBSOUP 1" >>confdefs.h
+$as_echo "#define WITH_LIBPSL 1" >>confdefs.h
 
 else
 
-$as_echo "#define WITH_LIBSOUP 0" >>confdefs.h
+$as_echo "#define WITH_LIBPSL 0" >>confdefs.h
 
 fi
- if test "$with_libsoup" != "no"; then
-  WITH_LIBSOUP_TRUE=
-  WITH_LIBSOUP_FALSE='#'
+ if test "$with_libpsl" != "no"; then
+  WITH_LIBPSL_TRUE=
+  WITH_LIBPSL_FALSE='#'
 else
-  WITH_LIBSOUP_TRUE='#'
-  WITH_LIBSOUP_FALSE=
+  WITH_LIBPSL_TRUE='#'
+  WITH_LIBPSL_FALSE=
 fi
 
-LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_40"
 
 # Check whether --enable-concheck was given.
 if test "${enable_concheck+set}" = set; then :
   enableval=$enable_concheck; enable_concheck=${enableval}
 else
-  enable_concheck=${with_libsoup}
+  enable_concheck=yes
+fi
+
+if test "${enable_concheck}" = "yes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5
+$as_echo_n "checking for LIBCURL... " >&6; }
+
+if test -n "$LIBCURL_CFLAGS"; then
+    pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.24.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBCURL_LIBS"; then
+    pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.24.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
-if (test "${enable_concheck}" = "yes"); then
-	if test x"$with_libsoup" = x"no"; then
-		as_fn_error $? "Connectivity checking requires libsoup" "$LINENO" 5
+
+
+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
+	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1`
+        else
+	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.24.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBCURL_PKG_ERRORS" >&5
+
+	have_libcurl=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_libcurl=no
+else
+	LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS
+	LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_libcurl=yes
+fi
+	if test "$have_libcurl" != "yes"; then
+		as_fn_error $? "--enable-concheck requires libcurl library." "$LINENO" 5
 	fi
 
 $as_echo "#define WITH_CONCHECK 1" >>confdefs.h
 
 else
+	enable_concheck=no
 
 $as_echo "#define WITH_CONCHECK 0" >>confdefs.h
 
@@ -26265,6 +26848,52 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+
+
+	CFLAGS_SAVED="$CFLAGS"
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wmissing-braces"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wmissing-braces works as expected" >&5
+$as_echo_n "checking whether -Wmissing-braces works as expected... " >&6; }
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+union { int a[1]; int b[2]; } c = { 0 }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wmissing-braces"
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-missing-braces"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
+$as_echo "not supported" >&6; }
+		CFLAGS="$CFLAGS_SAVED"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -26359,9 +26988,41 @@ if test "${enable_lto+set}" = set; then :
 fi
 
 if (test "${enable_lto}" = "yes"); then
-    CFLAGS="-flto $CFLAGS"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -flto in envvar CFLAGS" >&5
+$as_echo_n "checking if $CC supports flag -flto in envvar CFLAGS... " >&6; }
+if ${cc_cv_CFLAGS__flto+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "cc_save_CFLAGS='${CFLAGS}'"
+           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-flto" | sed 's/^-Wno-/-W/'`'"
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "cc_cv_CFLAGS__flto='yes'"
 else
-    enable_lto='no'
+  eval "cc_cv_CFLAGS__flto='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           eval "CFLAGS='$cc_save_CFLAGS'"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__flto" >&5
+$as_echo "$cc_cv_CFLAGS__flto" >&6; }
+
+  if eval test x$cc_cv_CFLAGS__flto = xyes; then :
+  eval "lto_flags='${lto_flags} -flto'"
+fi
+
+	if (test -n "${lto_flags}"); then
+		CFLAGS="-flto $CFLAGS"
+	else
+		as_fn_error $? "Link Time Optimization -flto is not supported." "$LINENO" 5
+	fi
+else
+	enable_lto='no'
 fi
 
 # Check whether --enable-ld-gc was given.
@@ -26400,7 +27061,7 @@ fi
 
 	if (test -n "${ld_gc_flags}"); then
 		enable_ld_gc="yes"
-		CFLAGS="$CFLAGS $ld_gc_flags"
+		CFLAGS="$ld_gc_flags $CFLAGS"
 	else
 		if (test "${enable_ld_gc}" = "yes"); then
 			as_fn_error $? "Unused symbol eviction requested but not supported." "$LINENO" 5
@@ -26410,6 +27071,7 @@ fi
 	fi
 fi
 
+
 # Check whether --enable-address-sanitizer was given.
 if test "${enable_address_sanitizer+set}" = set; then :
   enableval=$enable_address_sanitizer;
@@ -26875,6 +27537,320 @@ fi
 NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto'
 
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nm; 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_BINUTILS_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $BINUTILS_NM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BINUTILS_NM="$BINUTILS_NM" # 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_BINUTILS_NM="$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
+BINUTILS_NM=$ac_cv_path_BINUTILS_NM
+if test -n "$BINUTILS_NM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BINUTILS_NM" >&5
+$as_echo "$BINUTILS_NM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_BINUTILS_NM"; then
+  ac_pt_BINUTILS_NM=$BINUTILS_NM
+  # Extract the first word of "nm", so it can be a program name with args.
+set dummy nm; 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_ac_pt_BINUTILS_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_BINUTILS_NM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_BINUTILS_NM="$ac_pt_BINUTILS_NM" # 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_ac_pt_BINUTILS_NM="$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
+ac_pt_BINUTILS_NM=$ac_cv_path_ac_pt_BINUTILS_NM
+if test -n "$ac_pt_BINUTILS_NM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_BINUTILS_NM" >&5
+$as_echo "$ac_pt_BINUTILS_NM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_BINUTILS_NM" = x; then
+    BINUTILS_NM="nm"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    BINUTILS_NM=$ac_pt_BINUTILS_NM
+  fi
+else
+  BINUTILS_NM="$ac_cv_path_BINUTILS_NM"
+fi
+
+
+
+
+
+
+
+
+        # Find any Python interpreter.
+    if test -z "$PYTHON"; then
+      for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PYTHON+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PYTHON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON="$PYTHON" # 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_PYTHON="$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
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PYTHON" && break
+done
+test -n "$PYTHON" || PYTHON=":"
+
+    fi
+    am_display_PYTHON=python
+
+
+  if test "$PYTHON" = :; then
+      PYTHON=python
+  else
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if ${am_cv_python_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+  PYTHON_VERSION=$am_cv_python_version
+
+
+
+  PYTHON_PREFIX='${prefix}'
+
+  PYTHON_EXEC_PREFIX='${exec_prefix}'
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if ${am_cv_python_platform+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+  PYTHON_PLATFORM=$am_cv_python_platform
+
+
+  # Just factor out some code duplication.
+  am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x.  See automake bug#10227.
+try:
+    import sysconfig
+except ImportError:
+    can_use_sysconfig = 0
+else:
+    can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    from platform import python_implementation
+    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+        can_use_sysconfig = 0
+except ImportError:
+    pass"
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if ${am_cv_python_pythondir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$prefix" = xNONE
+     then
+       am_py_prefix=$ac_default_prefix
+     else
+       am_py_prefix=$prefix
+     fi
+     am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+     case $am_cv_python_pythondir in
+     $am_py_prefix*)
+       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+       ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
+     esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+  pythondir=$am_cv_python_pythondir
+
+
+
+  pkgpythondir=\${pythondir}/$PACKAGE
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if ${am_cv_python_pyexecdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$exec_prefix" = xNONE
+     then
+       am_py_exec_prefix=$am_py_prefix
+     else
+       am_py_exec_prefix=$exec_prefix
+     fi
+     am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+     case $am_cv_python_pyexecdir in
+     $am_py_exec_prefix*)
+       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+       ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
+     esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+  pyexecdir=$am_cv_python_pyexecdir
+
+
+
+  pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
+
+
+  fi
+
+
+PYTHON=$PYTHON
+
+
+cat >>confdefs.h <<_ACEOF
+#define TEST_NM_PYTHON "$PYTHON"
+_ACEOF
+
+
 
 
 
@@ -27246,345 +28222,8 @@ fi
 
 
 
-# check for pregenerated manpages to be installed
-install_pregen_manpages=no
-if test "$enable_gtk_doc" != "yes" \
-	-a -f man/nmcli.1 \
-	-a -f man/nmtui.1 \
-	-a -f man/nm-online.1 \
-	-a -f man/NetworkManager.conf.5 \
-	-a -f man/nm-settings.5 \
-	-a -f man/nm-settings-keyfile.5 \
-	-a -f man/nm-settings-ifcfg-rh.5 \
-	-a -f man/nmcli-examples.7 \
-	-a -f man/NetworkManager.8; then
-	install_pregen_manpages=yes
-fi
- if test "x${install_pregen_manpages}" = "xyes"; then
-  INSTALL_PREGEN_MANPAGES_TRUE=
-  INSTALL_PREGEN_MANPAGES_FALSE='#'
-else
-  INSTALL_PREGEN_MANPAGES_TRUE='#'
-  INSTALL_PREGEN_MANPAGES_FALSE=
-fi
-
-
-
-
-
-
-
-
-        # Find any Python interpreter.
-    if test -z "$PYTHON"; then
-      for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # 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_PYTHON="$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
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PYTHON" && break
-done
-test -n "$PYTHON" || PYTHON=":"
-
-    fi
-    am_display_PYTHON=python
-
-
-  if test "$PYTHON" = :; then
-      PYTHON=python
-  else
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
-  PYTHON_VERSION=$am_cv_python_version
-
-
-
-  PYTHON_PREFIX='${prefix}'
-
-  PYTHON_EXEC_PREFIX='${exec_prefix}'
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
-  PYTHON_PLATFORM=$am_cv_python_platform
-
-
-  # Just factor out some code duplication.
-  am_python_setup_sysconfig="\
-import sys
-# Prefer sysconfig over distutils.sysconfig, for better compatibility
-# with python 3.x.  See automake bug#10227.
-try:
-    import sysconfig
-except ImportError:
-    can_use_sysconfig = 0
-else:
-    can_use_sysconfig = 1
-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
-# <https://github.com/pypa/virtualenv/issues/118>
-try:
-    from platform import python_implementation
-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-        can_use_sysconfig = 0
-except ImportError:
-    pass"
-
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$prefix" = xNONE
-     then
-       am_py_prefix=$ac_default_prefix
-     else
-       am_py_prefix=$prefix
-     fi
-     am_cv_python_pythondir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
-    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
-else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
-     case $am_cv_python_pythondir in
-     $am_py_prefix*)
-       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
-       ;;
-     *)
-       case $am_py_prefix in
-         /usr|/System*) ;;
-         *)
-	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-	  ;;
-       esac
-       ;;
-     esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
-  pythondir=$am_cv_python_pythondir
-
-
-
-  pkgpythondir=\${pythondir}/$PACKAGE
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$exec_prefix" = xNONE
-     then
-       am_py_exec_prefix=$am_py_prefix
-     else
-       am_py_exec_prefix=$exec_prefix
-     fi
-     am_cv_python_pyexecdir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
-    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
-else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
-     case $am_cv_python_pyexecdir in
-     $am_py_exec_prefix*)
-       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
-       ;;
-     *)
-       case $am_py_exec_prefix in
-         /usr|/System*) ;;
-         *)
-	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
-	   ;;
-       esac
-       ;;
-     esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
-  pyexecdir=$am_cv_python_pyexecdir
-
-
-
-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-
-
-  fi
-
-
-PYTHON=$PYTHON
-
-
-cat >>confdefs.h <<_ACEOF
-#define TEST_NM_PYTHON "$PYTHON"
-_ACEOF
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; 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_BINUTILS_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BINUTILS_NM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BINUTILS_NM="$BINUTILS_NM" # 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_BINUTILS_NM="$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
-BINUTILS_NM=$ac_cv_path_BINUTILS_NM
-if test -n "$BINUTILS_NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BINUTILS_NM" >&5
-$as_echo "$BINUTILS_NM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_BINUTILS_NM"; then
-  ac_pt_BINUTILS_NM=$BINUTILS_NM
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; 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_ac_pt_BINUTILS_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_BINUTILS_NM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_BINUTILS_NM="$ac_pt_BINUTILS_NM" # 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_ac_pt_BINUTILS_NM="$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
-ac_pt_BINUTILS_NM=$ac_cv_path_ac_pt_BINUTILS_NM
-if test -n "$ac_pt_BINUTILS_NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_BINUTILS_NM" >&5
-$as_echo "$ac_pt_BINUTILS_NM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_BINUTILS_NM" = x; then
-    BINUTILS_NM="nm"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    BINUTILS_NM=$ac_pt_BINUTILS_NM
-  fi
-else
-  BINUTILS_NM="$ac_cv_path_BINUTILS_NM"
-fi
-
-
 # check if we can build setting property documentation
-build_setting_docs=no
+build_docs=no
 if test -n "$INTROSPECTION_MAKEFILE"; then
     # If g-i is installed we know we have python, but we might not have pygobject
     if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
@@ -27618,7 +28257,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
   ;;
 esac
 fi
@@ -27632,6 +28270,9 @@ $as_echo "no" >&6; }
 fi
 
 
+    if test -z "$PERL"; then
+        as_fn_error $? "--enable-introspection requires perl" "$LINENO" 5
+    fi
     # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -27659,7 +28300,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
   ;;
 esac
 fi
@@ -27673,10 +28313,13 @@ $as_echo "no" >&6; }
 fi
 
 
+    if test -z "$XSLTPROC"; then
+        as_fn_error $? "--enable-introspection requires xsltproc" "$LINENO" 5
+    fi
 
     have_introspection=yes
     if test "$enable_gtk_doc" = "yes"; then
-        build_setting_docs=yes
+        build_docs=yes
     fi
 else
     if test "$enable_gtk_doc" = "yes"; then
@@ -27687,33 +28330,47 @@ else
     have_introspection=no
 fi
 
-# check for pre-built setting docs
-if test "$build_setting_docs" != "yes" \
-	-a -f man/nm-settings.xml \
-	-a -f man/nm-settings-keyfile.xml \
-	-a -f man/nm-settings-ifcfg-rh.xml \
-	-a -f docs/api/settings-spec.xml; then
-    have_setting_docs=yes
+# check for pregenerated manpages and documentation to be installed
+use_pregen_docs=no
+if test "$build_docs" != "yes" \
+    -a -f man/NetworkManager.8 \
+    -a -f man/NetworkManager.conf.5 \
+    -a -f man/nm-online.1 \
+    -a -f man/nmcli-examples.7 \
+    -a -f man/nmcli.1 \
+    -a -f man/nmtui.1 \
+    \
+    -a -f man/nm-settings-ifcfg-rh.5 \
+    -a -f man/nm-settings-keyfile.5 \
+    -a -f man/nm-settings.5 \
+    \
+    -a -f man/nm-settings.xml \
+    -a -f man/nm-settings-keyfile.xml \
+    -a -f man/nm-settings-ifcfg-rh.xml \
+    \
+    -a -f docs/api/settings-spec.xml \
+    ; then
+	use_pregen_docs=yes
 fi
 
- if test "$build_setting_docs" = "yes"; then
-  BUILD_SETTING_DOCS_TRUE=
-  BUILD_SETTING_DOCS_FALSE='#'
+ if test "$build_docs" = "yes"; then
+  BUILD_DOCS_TRUE=
+  BUILD_DOCS_FALSE='#'
 else
-  BUILD_SETTING_DOCS_TRUE='#'
-  BUILD_SETTING_DOCS_FALSE=
+  BUILD_DOCS_TRUE='#'
+  BUILD_DOCS_FALSE=
 fi
 
- if test "$build_setting_docs" = "yes" -o "$have_setting_docs" = "yes"; then
-  SETTING_DOCS_AVAILABLE_TRUE=
-  SETTING_DOCS_AVAILABLE_FALSE='#'
+ if test "$build_docs" = "yes" -o "$use_pregen_docs" = "yes"; then
+  HAVE_DOCS_TRUE=
+  HAVE_DOCS_FALSE='#'
 else
-  SETTING_DOCS_AVAILABLE_TRUE='#'
-  SETTING_DOCS_AVAILABLE_FALSE=
+  HAVE_DOCS_TRUE='#'
+  HAVE_DOCS_FALSE=
 fi
 
 
-ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc man/common.ent po/Makefile.in data/org.freedesktop.NetworkManager.policy.in 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"
+ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in 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"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -27921,6 +28578,10 @@ if test -z "${WITH_TEAMDCTL_TRUE}" && test -z "${WITH_TEAMDCTL_FALSE}"; then
   as_fn_error $? "conditional \"WITH_TEAMDCTL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_JANSSON_TRUE}" && test -z "${WITH_JANSSON_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_JANSSON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_POLKIT_AGENT_TRUE}" && test -z "${WITH_POLKIT_AGENT_FALSE}"; then
   as_fn_error $? "conditional \"WITH_POLKIT_AGENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27949,8 +28610,8 @@ if test -z "${WITH_OFONO_TRUE}" && test -z "${WITH_OFONO_FALSE}"; then
   as_fn_error $? "conditional \"WITH_OFONO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_LIBSOUP_TRUE}" && test -z "${WITH_LIBSOUP_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_LIBSOUP\" was never defined.
+if test -z "${WITH_LIBPSL_TRUE}" && test -z "${WITH_LIBPSL_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBPSL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_CONCHECK_TRUE}" && test -z "${WITH_CONCHECK_FALSE}"; then
@@ -28001,16 +28662,12 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"
   as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${INSTALL_PREGEN_MANPAGES_TRUE}" && test -z "${INSTALL_PREGEN_MANPAGES_FALSE}"; then
-  as_fn_error $? "conditional \"INSTALL_PREGEN_MANPAGES\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_SETTING_DOCS_TRUE}" && test -z "${BUILD_SETTING_DOCS_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SETTING_DOCS\" was never defined.
+if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${SETTING_DOCS_AVAILABLE_TRUE}" && test -z "${SETTING_DOCS_AVAILABLE_FALSE}"; then
-  as_fn_error $? "conditional \"SETTING_DOCS_AVAILABLE\" was never defined.
+if test -z "${HAVE_DOCS_TRUE}" && test -z "${HAVE_DOCS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -28410,7 +29067,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.6.2, which was
+This file was extended by NetworkManager $as_me 1.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28476,7 +29133,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.6.2
+NetworkManager config.status 1.8.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -29004,7 +29661,6 @@ do
     "libnm-util/libnm-util.pc") CONFIG_FILES="$CONFIG_FILES libnm-util/libnm-util.pc" ;;
     "libnm-glib/libnm-glib.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib.pc" ;;
     "libnm-glib/libnm-glib-vpn.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib-vpn.pc" ;;
-    "man/common.ent") CONFIG_FILES="$CONFIG_FILES man/common.ent" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "data/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES data/org.freedesktop.NetworkManager.policy.in" ;;
     "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;;
@@ -30654,9 +31310,9 @@ echo "  dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6"
 echo
 
 echo "Miscellaneous:"
-echo "  documentation: $enable_gtk_doc"
-echo "  documentation-settings: $build_setting_docs"
-echo "  introspection: $have_introspection"
+echo "  have introspection: $have_introspection"
+echo "  build documentation and manpages: $build_docs"
+echo "  install pregenerated documentation and manpages: $use_pregen_docs"
 echo "  tests: $enable_tests"
 echo "  more-asserts: $more_asserts"
 echo "  more-logging: $enable_more_logging"
@@ -30665,6 +31321,7 @@ echo "  valgrind: $with_valgrind   $with_valgrind_suppressions"
 echo "  code coverage: $enable_code_coverage"
 echo "  LTO: $enable_lto"
 echo "  linker garbage collection: $enable_ld_gc"
-echo "  JSON validation: $enable_json_validation"
+echo "  JSON validation for libnm: $enable_json_validation"
 echo "  sanitizers: $sanitizers"
+echo "  Mozilla Public Suffix List: $with_libpsl"
 echo