Imported Upstream version 1.4.0 upstream/1.4.0

1 files changed, 786 insertions, 136 deletions

diff --git a/configure b/configure
index 21340a82..a290af83 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.2.4.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.4.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.2.4'
-PACKAGE_STRING='NetworkManager 1.2.4'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='NetworkManager 1.4.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -678,6 +678,8 @@ ENABLE_VAPIGEN_TRUE
 VAPIGEN_MAKEFILE
 VAPIGEN_VAPIDIR
 VAPIGEN
+SANITIZERS
+SANITIZER_ENV
 BUILD_NMTUI_FALSE
 BUILD_NMTUI_TRUE
 NEWT_LIBS
@@ -705,6 +707,8 @@ DHCPCD_PATH
 DHCLIENT_PATH
 with_dhcpcd
 with_dhclient
+WITH_OFONO_FALSE
+WITH_OFONO_TRUE
 WITH_BLUEZ5_DUN_FALSE
 WITH_BLUEZ5_DUN_TRUE
 BLUEZ5_LIBS
@@ -735,6 +739,8 @@ WITH_POLKIT_AGENT_TRUE
 POLKIT_LIBS
 POLKIT_CFLAGS
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT
+JANSSON_LIBS
+JANSSON_CFLAGS
 WITH_TEAMDCTL_FALSE
 WITH_TEAMDCTL_TRUE
 LIBTEAMDCTL_LIBS
@@ -748,12 +754,6 @@ 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
 SYSTEMD_LOGIN_LIBS
@@ -761,6 +761,8 @@ SYSTEMD_LOGIN_CFLAGS
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT
 SYSTEMD_JOURNAL_LIBS
 SYSTEMD_JOURNAL_CFLAGS
+LIBSYSTEMD_LIBS
+LIBSYSTEMD_CFLAGS
 HAVE_SYSTEMD_200_FALSE
 HAVE_SYSTEMD_200_TRUE
 SYSTEMD_200_LIBS
@@ -799,7 +801,7 @@ GLIB_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-LIBDL
+DL_LIBS
 LIBM
 WITH_WEXT_FALSE
 WITH_WEXT_TRUE
@@ -889,9 +891,6 @@ LIPO
 NMEDIT
 DSYMUTIL
 MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
 DLLTOOL
 OBJDUMP
 NM
@@ -909,6 +908,10 @@ build_vendor
 build_cpu
 build
 LIBTOOL
+ac_ct_RANLIB
+RANLIB
+ac_ct_AR
+AR
 LN_S
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -1047,6 +1050,7 @@ with_suspend_resume
 with_selinux
 with_libaudit
 enable_teamdctl
+enable_json_validation
 enable_polkit
 enable_polkit_agent
 enable_modify_system
@@ -1057,6 +1061,7 @@ with_pppd_plugin_dir
 with_pppd
 with_modem_manager_1
 enable_bluez5_dun
+with_ofono
 with_dhclient
 with_dhcpcd
 with_resolvconf
@@ -1076,6 +1081,9 @@ enable_more_asserts
 with_more_asserts
 enable_more_logging
 enable_lto
+enable_ld_gc
+enable_address_sanitizer
+enable_undefined_sanitizer
 enable_vala
 enable_tests
 with_valgrind
@@ -1113,6 +1121,8 @@ QT_CFLAGS
 QT_LIBS
 SYSTEMD_200_CFLAGS
 SYSTEMD_200_LIBS
+LIBSYSTEMD_CFLAGS
+LIBSYSTEMD_LIBS
 SYSTEMD_JOURNAL_CFLAGS
 SYSTEMD_JOURNAL_LIBS
 SYSTEMD_LOGIN_CFLAGS
@@ -1129,6 +1139,8 @@ UUID_CFLAGS
 UUID_LIBS
 LIBTEAMDCTL_CFLAGS
 LIBTEAMDCTL_LIBS
+JANSSON_CFLAGS
+JANSSON_LIBS
 POLKIT_CFLAGS
 POLKIT_LIBS
 NSS_CFLAGS
@@ -1687,7 +1699,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.2.4 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1757,7 +1769,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.2.4:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1794,6 +1806,8 @@ Optional Features:
                           Enable introspection for this build
   --enable-qt             enable Qt examples
   --enable-teamdctl       enable Teamd control support
+  --enable-json-validation
+                          Enable JSON validation in libnm
   --enable-polkit=yes|no|disabled
                           set default value for auth-polkit configuration
                           option. This value can be overwritten by NM
@@ -1810,6 +1824,13 @@ Optional Features:
   --enable-more-logging   Enable more debug logging (default: no)
   --enable-lto            Enable Link Time Optimization for smaller size
                           (default: no)
+  --enable-ld-gc          Enable garbage collection of unused symbols on
+                          linking (default: auto)
+  --enable-address-sanitizer
+                          Compile with address sanitizer (default: no)
+  --enable-undefined-sanitizer
+                          Compile with undefined behavior sanitizer (default:
+                          no)
   --enable-vala=[no/auto/yes]
                           build Vala bindings [[default=auto]]
   --enable-tests=root|yes|no
@@ -1850,7 +1871,7 @@ Optional Packages:
                           Hostname persist method
   --with-systemd-journal=yes|no
                           Use systemd journal for logging
-  --with-logging-backend-default=backend
+  --with-config-logging-backend-default=backend
                           Default value for logging.backend
   --with-systemd-logind=yes|no
                           Support systemd session tracking
@@ -1878,6 +1899,7 @@ Optional Packages:
   --with-pppd=/path/to/pppd
                           path to pppd binary
   --with-modem-manager-1  Enable new ModemManager1 interface support
+  --with-ofono            Enable oFono support (experimental)
   --with-dhclient=yes|no|path
                           Enable dhclient 4.x support
   --with-dhcpcd=yes|no|path
@@ -1942,6 +1964,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
+  LIBSYSTEMD_CFLAGS
+              C compiler flags for LIBSYSTEMD, overriding pkg-config
+  LIBSYSTEMD_LIBS
+              linker flags for LIBSYSTEMD, overriding pkg-config
   SYSTEMD_JOURNAL_CFLAGS
               C compiler flags for SYSTEMD_JOURNAL, overriding pkg-config
   SYSTEMD_JOURNAL_LIBS
@@ -1971,6 +1997,10 @@ Some influential environment variables:
               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
   POLKIT_CFLAGS
               C compiler flags for POLKIT, overriding pkg-config
   POLKIT_LIBS linker flags for POLKIT, overriding pkg-config
@@ -2066,7 +2096,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.2.4
+NetworkManager configure 1.4.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2793,7 +2823,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 1.2.4, which was
+It was created by NetworkManager $as_me 1.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3663,7 +3693,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.2.4'
+ VERSION='1.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6560,6 +6590,208 @@ $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
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in gcc-ar ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  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
+    AR=$ac_ct_AR
+  fi
+fi
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in gcc-ranlib ranlib
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$RANLIB" && break
+  done
+fi
+if test -z "$RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  for ac_prog in gcc-ranlib ranlib
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_RANLIB" && break
+done
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  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
+    RANLIB=$ac_ct_RANLIB
+  fi
+fi
+
+
 
 case `pwd` in
   *\ * | *\	*)
@@ -17543,10 +17775,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=2
-NM_MICRO_VERSION=4
-NM_VERSION=1.2.4
-NM_GIT_SHA=54a84c6b3bd04123ee0831ae371d795ddd694cf9
+NM_MINOR_VERSION=4
+NM_MICRO_VERSION=0
+NM_VERSION=1.4.0
+NM_GIT_SHA=93b4119a81af57c274ac58210a8776afecf2a252
 
 
 
@@ -21140,13 +21372,12 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5
-$as_echo_n "checking for dladdr in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dladdr+:} false; then :
+{ $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 :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21156,32 +21387,50 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char dladdr ();
+char dlopen ();
 int
 main ()
 {
-return dladdr ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dladdr=yes
-else
-  ac_cv_lib_dl_dladdr=no
+for ac_lib in '' dl dld; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5
-$as_echo "$ac_cv_lib_dl_dladdr" >&6; }
-if test "x$ac_cv_lib_dl_dladdr" = xyes; then :
-  LIBDL="-ldl"
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
 else
-  LIBDL=""
+  ac_cv_search_dlopen=no
 fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+else
+  ac_cv_search_dlopen=
+fi
+
+DL_LIBS="$ac_cv_search_dlopen"
 
 
 
@@ -22184,6 +22433,84 @@ $as_echo "#define HOSTNAME_PERSIST_SLACKWARE 1" >>confdefs.h
 fi
 
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5
+$as_echo_n "checking for LIBSYSTEMD... " >&6; }
+
+if test -n "$LIBSYSTEMD_CFLAGS"; then
+    pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_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_LIBSYSTEMD_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 "$LIBSYSTEMD_LIBS"; then
+    pkg_cv_LIBSYSTEMD_LIBS="$LIBSYSTEMD_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_LIBSYSTEMD_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
+	        LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
+        else
+	        LIBSYSTEMD_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 "$LIBSYSTEMD_PKG_ERRORS" >&5
+
+
+$as_echo "#define HAVE_LIBSYSTEMD 0" >>confdefs.h
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define HAVE_LIBSYSTEMD 0" >>confdefs.h
+
+else
+	LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
+	LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBSYSTEMD 1" >>confdefs.h
+
+fi
+
+
 # Check whether --with-systemd-journal was given.
 if test "${with_systemd_journal+set}" = set; then :
   withval=$with_systemd_journal;
@@ -22426,6 +22753,7 @@ 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' \
@@ -22776,7 +23104,11 @@ fi
 fi
 
 case $with_suspend_resume in
-    upower) ;;
+    upower)
+
+$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h
+
+	;;
     systemd)
 
 pkg_failed=no
@@ -23042,30 +23374,6 @@ $as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h
         as_fn_error $? "--with-suspend-resume must be one of upower, systemd, consolekit" "$LINENO" 5
         ;;
 esac
- if test "x$with_suspend_resume" = "xupower"; then
-  SUSPEND_RESUME_UPOWER_TRUE=
-  SUSPEND_RESUME_UPOWER_FALSE='#'
-else
-  SUSPEND_RESUME_UPOWER_TRUE='#'
-  SUSPEND_RESUME_UPOWER_FALSE=
-fi
-
- if test "x$with_suspend_resume" = "xsystemd"; then
-  SUSPEND_RESUME_SYSTEMD_TRUE=
-  SUSPEND_RESUME_SYSTEMD_FALSE='#'
-else
-  SUSPEND_RESUME_SYSTEMD_TRUE='#'
-  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
 
@@ -23565,6 +23873,97 @@ else
 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; }
+
+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
+# Check whether --enable-json-validation was given.
+if test "${enable_json_validation+set}" = set; then :
+  enableval=$enable_json_validation; enable_json_validation=${enableval}
+else
+  enable_json_validation=${have_jansson}
+fi
+
+if (test "${enable_json_validation}" = "yes"); then
+	if test x"$have_jansson" = x"no"; then
+		as_fn_error $? "Jansson is required for JSON validation" "$LINENO" 5
+	fi
+
+$as_echo "#define WITH_JANSSON 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_JANSSON 0" >>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
 # autorization via config. Only when specifying --enable-polkit=disabled, we do
@@ -24291,6 +24690,33 @@ else
 fi
 
 
+# OFONO
+
+# Check whether --with-ofono was given.
+if test "${with_ofono+set}" = set; then :
+  withval=$with_ofono;
+else
+  with_ofono=no
+fi
+
+if (test "${with_ofono}" = "yes"); then
+
+$as_echo "#define WITH_OFONO 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_OFONO 0" >>confdefs.h
+
+fi
+ if test "${with_ofono}" = "yes"; then
+  WITH_OFONO_TRUE=
+  WITH_OFONO_FALSE='#'
+else
+  WITH_OFONO_TRUE='#'
+  WITH_OFONO_FALSE=
+fi
+
+
 # DHCP client support
 
 # Check whether --with-dhclient was given.
@@ -24477,7 +24903,10 @@ if test "${with_config_dns_rc_manager_default+set}" = set; then :
   withval=$with_config_dns_rc_manager_default; config_dns_rc_manager_default=$withval
 fi
 
-if test "$config_dns_rc_manager_default" != symlink -a "$config_dns_rc_manager_default" != file -a "$config_dns_rc_manager_default" != netconfig -a "$config_dns_rc_manager_default" != resolvconf; then
+if test "$config_dns_rc_manager_default" != symlink -a \
+        "$config_dns_rc_manager_default" != file -a \
+        "$config_dns_rc_manager_default" != netconfig -a \
+        "$config_dns_rc_manager_default" != resolvconf; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&5
 $as_echo "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&2;}
 	config_dns_rc_manager_default=
@@ -25398,10 +25827,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	unset CFLAGS_SAVED
 
 
+
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wunknown-warning-option"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-warning-option works" >&5
-$as_echo_n "checking whether -Wunknown-warning-option works... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunknown-warning-option"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-warning-option works as expected" >&5
+$as_echo_n "checking whether -Wunknown-warning-option works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25417,13 +25847,15 @@ 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 -Wunknown-warning-option"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wunknown-warning-option"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED -Wno-unknown-warning-option"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-unknown-warning-option"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -25438,7 +25870,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	CFLAGS_SAVED="$CFLAGS"
+
 	CFLAGS_MORE_WARNINGS="-Wall -std=gnu89"
 
 	if test "x$set_more_warnings" = xerror; then
@@ -25450,48 +25882,63 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
 		      -Wno-duplicate-decl-specifier \
 		      -Wstrict-prototypes \
-		      -fno-strict-aliasing -Wno-unused-but-set-variable \
+		      -Wno-unused-but-set-variable \
+		      -Wno-format-y2k \
 		      -Wundef -Wimplicit-function-declaration \
-		      -Wpointer-arith -Winit-self \
+		      -Wpointer-arith -Winit-self -Wformat-nonliteral \
 		      -Wmissing-include-dirs -Wno-pragmas; do
-				CFLAGS="-Werror $CFLAGS_MORE_WARNINGS $(printf '%s' "$option" | sed 's/^-Wno-/-W/')  $CFLAGS_SAVED"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler understands $option" >&5
-$as_echo_n "checking whether compiler understands $option... " >&6; }
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+	CFLAGS_SAVED="$CFLAGS"
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror $(printf '%s' "$option" | sed 's/^-Wno-/-W/')"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected" >&5
+$as_echo_n "checking whether $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected... " >&6; }
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-int
-main ()
-{
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  ;
-  return 0;
-}
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  has_option=yes
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 else
-  has_option=no
+
+		{ $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
-		if test $has_option != no; then
-			CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"
-		fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
-$as_echo "$has_option" >&6; }
-		unset has_option
+
 	done
 	unset option
 
-	CFLAGS="$CFLAGS_SAVED"
-	unset CFLAGS_SAVED
 
 
 
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wunknown-attributes"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-attributes works" >&5
-$as_echo_n "checking whether -Wunknown-attributes works... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunknown-attributes"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-attributes works as expected" >&5
+$as_echo_n "checking whether -Wunknown-attributes works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25507,13 +25954,15 @@ 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 -Wunknown-attributes"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wunknown-attributes"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED -Wno-unknown-attributes"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-unknown-attributes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -25529,10 +25978,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+
+
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wtypedef-redefinition"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wtypedef-redefinition works" >&5
-$as_echo_n "checking whether -Wtypedef-redefinition works... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wtypedef-redefinition"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wtypedef-redefinition works as expected" >&5
+$as_echo_n "checking whether -Wtypedef-redefinition works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25548,13 +25999,15 @@ 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 -Wtypedef-redefinition"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wtypedef-redefinition"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED -Wno-typedef-redefinition"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-typedef-redefinition"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -25570,10 +26023,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+
+
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Warray-bounds"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Warray-bounds works" >&5
-$as_echo_n "checking whether -Warray-bounds works... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Warray-bounds"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Warray-bounds works as expected" >&5
+$as_echo_n "checking whether -Warray-bounds works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25591,13 +26046,15 @@ 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 -Warray-bounds"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Warray-bounds"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED -Wno-array-bounds"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-array-bounds"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -25613,10 +26070,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+
+
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wparentheses-equality"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wparentheses-equality works" >&5
-$as_echo_n "checking whether -Wparentheses-equality works... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wparentheses-equality"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wparentheses-equality works as expected" >&5
+$as_echo_n "checking whether -Wparentheses-equality works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25634,13 +26093,15 @@ 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 -Wparentheses-equality"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wparentheses-equality"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED -Wno-parentheses-equality"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-parentheses-equality"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -25656,10 +26117,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+
+
 	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wunused-value"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunused-value works" >&5
-$as_echo_n "checking whether -Wunused-value works... " >&6; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunused-value"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunused-value works as expected" >&5
+$as_echo_n "checking whether -Wunused-value works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25677,13 +26140,15 @@ 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 -Wunused-value"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wunused-value"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED -Wno-unused-value"
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-unused-value"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -25698,6 +26163,7 @@ 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
@@ -25705,6 +26171,43 @@ $as_echo "no" >&6; }
 fi
 
 
+
+  for flag in \
+	-fno-strict-aliasing \
+; do
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5
+$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; }
+if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "cc_save_CFLAGS='${CFLAGS}'"
+           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | 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 "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'"
+else
+  eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           eval "CFLAGS='$cc_save_CFLAGS'"
+fi
+eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+  if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then :
+  eval "with_cflags='${with_cflags} $flag'"
+fi
+
+  done
+
+CFLAGS="$CFLAGS $with_cflags"
+
 # Check whether --enable-more-asserts was given.
 if test "${enable_more_asserts+set}" = set; then :
   enableval=$enable_more_asserts;
@@ -25755,6 +26258,158 @@ else
     enable_lto='no'
 fi
 
+# Check whether --enable-ld-gc was given.
+if test "${enable_ld_gc+set}" = set; then :
+  enableval=$enable_ld_gc;
+fi
+
+if (test "${enable_ld_gc}" != "no"); then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS" >&5
+$as_echo_n "checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS... " >&6; }
+if ${cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "cc_save_CFLAGS='${CFLAGS}'"
+           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-fdata-sections -ffunction-sections -Wl,--gc-sections" | 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__fdata_sections__ffunction_sections__Wl___gc_sections='yes'"
+else
+  eval "cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections='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__fdata_sections__ffunction_sections__Wl___gc_sections" >&5
+$as_echo "$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections" >&6; }
+
+  if eval test x$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections = xyes; then :
+  eval "ld_gc_flags='${ld_gc_flags} -fdata-sections -ffunction-sections -Wl,--gc-sections'"
+fi
+
+	if (test -n "${ld_gc_flags}"); then
+		enable_ld_gc="yes"
+		CFLAGS="$CFLAGS $ld_gc_flags"
+	else
+		if (test "${enable_ld_gc}" = "yes"); then
+			as_fn_error $? "Unused symbol eviction requested but not supported." "$LINENO" 5
+		else
+			enable_ld_gc="no"
+		fi
+	fi
+fi
+
+# Check whether --enable-address-sanitizer was given.
+if test "${enable_address_sanitizer+set}" = set; then :
+  enableval=$enable_address_sanitizer;
+fi
+
+if (test "${enable_address_sanitizer}" = "yes"); then
+
+  for flag in -fsanitize=address; do
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5
+$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; }
+if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "cc_save_CFLAGS='${CFLAGS}'"
+           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | 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 "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'"
+else
+  eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           eval "CFLAGS='$cc_save_CFLAGS'"
+fi
+eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+  if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then :
+  eval "asan_cflags='${asan_cflags} $flag'"
+fi
+
+  done
+
+	if test -z "$asan_cflags"; then :
+  as_fn_error $? "*** -fsanitize=address is not supported" "$LINENO" 5
+fi
+
+	sanitizer_cflags="$sanitizer_cflags -fsanitize=address"
+	sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=address"
+	sanitizers="${sanitizers}asan "
+fi
+
+# Check whether --enable-undefined-sanitizer was given.
+if test "${enable_undefined_sanitizer+set}" = set; then :
+  enableval=$enable_undefined_sanitizer;
+fi
+
+if (test "${enable_undefined_sanitizer}" = "yes"); then
+
+  for flag in -fsanitize=undefined; do
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5
+$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; }
+if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "cc_save_CFLAGS='${CFLAGS}'"
+           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | 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 "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'"
+else
+  eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           eval "CFLAGS='$cc_save_CFLAGS'"
+fi
+eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+  if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then :
+  eval "ubsan_cflags='${ubsan_cflags} $flag'"
+fi
+
+  done
+
+	if test -z "$ubsan_cflags"; then :
+  as_fn_error $? "*** -fsanitize=undefined is not supported" "$LINENO" 5
+fi
+
+	sanitizer_cflags="$sanitizer_cflags -fsanitize=undefined"
+	sanitizer_ldflags="$sanitizer_ldflags -Wc,-fsanitize=undefined"
+	sanitizers="${sanitizers}ubsan "
+fi
+
+if test -n "$sanitizers"; then
+	CFLAGS="$CFLAGS $sanitizer_cflags -DVALGRIND=1 -fno-omit-frame-pointer"
+	LDFLAGS="$LDFLAGS $sanitizer_ldflags"
+	sanitizers="${sanitizers% }"
+	SANITIZER_ENV=ASAN_OPTIONS=detect_leaks=0
+
+fi
+
+SANITIZERS=$sanitizers
+
 
 
 
@@ -26619,7 +27274,6 @@ else
 fi
 
 
-
 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 man/Makefile man/common.ent 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"
 
 
@@ -26828,18 +27482,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 "${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
-fi
-if test -z "${SUSPEND_RESUME_SYSTEMD_TRUE}" && test -z "${SUSPEND_RESUME_SYSTEMD_FALSE}"; then
-  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 "${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
   as_fn_error $? "conditional \"WITH_TEAMDCTL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26868,6 +27510,10 @@ if test -z "${WITH_BLUEZ5_DUN_TRUE}" && test -z "${WITH_BLUEZ5_DUN_FALSE}"; then
   as_fn_error $? "conditional \"WITH_BLUEZ5_DUN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27333,7 +27979,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.2.4, which was
+This file was extended by NetworkManager $as_me 1.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27399,7 +28045,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.2.4
+NetworkManager config.status 1.4.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -29759,8 +30405,9 @@ echo
 echo "Features:"
 echo "  wext: $ac_with_wext"
 echo "  wifi: $enable_wifi"
-echo "  ppp: $enable_ppp"
+echo "  ppp: $enable_ppp ${PPPD_PLUGIN_DIR}"
 echo "  modemmanager-1: $with_modem_manager_1"
+echo "  ofono: $with_ofono"
 echo "  concheck: $enable_concheck"
 echo "  libteamdctl: $enable_teamdctl"
 echo "  libnm-glib: $with_libnm_glib"
@@ -29793,4 +30440,7 @@ echo "  more-asserts: $more_asserts"
 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 "  sanitizers: $sanitizers"
 echo