New upstream version 1.14.2 upstream/1.14.2

1 files changed, 312 insertions, 658 deletions

diff --git a/configure b/configure
index 6e6226bb..853fa98d 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.12.4.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.14.2.
 #
 # 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.12.4'
-PACKAGE_STRING='NetworkManager 1.12.4'
+PACKAGE_VERSION='1.14.2'
+PACKAGE_STRING='NetworkManager 1.14.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -705,20 +705,17 @@ LIBPSL_LIBS
 LIBPSL_CFLAGS
 KERNEL_FIRMWARE_DIR
 SYSTEM_CA_PATH
-DNSSEC_TRIGGER_SCRIPT
+DNSSEC_TRIGGER_PATH
 DNSMASQ_PATH
 IPTABLES_PATH
 NM_CONFIG_DEFAULT_MAIN_RC_MANAGER
 with_netconfig
 with_resolvconf
 NM_CONFIG_DEFAULT_MAIN_DHCP
-DHCPCD_PATH
 with_dhcpcd
-DHCLIENT_PATH
 with_dhclient
 WITH_OPENVSWITCH_FALSE
 WITH_OPENVSWITCH_TRUE
-DHCPCANON_PATH
 with_dhcpcanon
 WITH_OFONO_FALSE
 WITH_OFONO_TRUE
@@ -741,10 +738,14 @@ WITH_GNUTLS_FALSE
 WITH_GNUTLS_TRUE
 WITH_NSS_FALSE
 WITH_NSS_TRUE
-GNUTLS_LIBS
-GNUTLS_CFLAGS
+HAVE_CRYPTO_NSS_FALSE
+HAVE_CRYPTO_NSS_TRUE
+HAVE_CRYPTO_GNUTLS_FALSE
+HAVE_CRYPTO_GNUTLS_TRUE
 NSS_LIBS
 NSS_CFLAGS
+GNUTLS_LIBS
+GNUTLS_CFLAGS
 NM_MODIFY_SYSTEM_POLICY
 WITH_POLKIT_AGENT_FALSE
 WITH_POLKIT_AGENT_TRUE
@@ -951,7 +952,6 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -1028,7 +1028,8 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -1087,7 +1088,6 @@ with_dhcpcanon
 enable_ovs
 with_dhclient
 with_dhcpcd
-with_dhcpcd_supports_ipv6
 with_config_dhcp_default
 with_resolvconf
 with_netconfig
@@ -1168,10 +1168,10 @@ LIBTEAMDCTL_CFLAGS
 LIBTEAMDCTL_LIBS
 POLKIT_CFLAGS
 POLKIT_LIBS
-NSS_CFLAGS
-NSS_LIBS
 GNUTLS_CFLAGS
 GNUTLS_LIBS
+NSS_CFLAGS
+NSS_LIBS
 MM_GLIB_CFLAGS
 MM_GLIB_LIBS
 BLUEZ5_CFLAGS
@@ -1727,7 +1727,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.12.4 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.14.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1797,7 +1797,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.12.4:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.14.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1928,11 +1928,9 @@ Optional Packages:
   --with-dhcpcanon=yes|no|path
                           Enable dhcpcanon support (experimental)
   --with-dhclient=yes|no|path
-                          Enable dhclient 4.x support
+                          Enable dhclient support
   --with-dhcpcd=yes|no|path
                           Enable dhcpcd 4.x support
-  --with-dhcpcd-supports-ipv6=yes|no|auto
-                          Whether using dhcpcd >= 6.x which has IPv6 support
   --with-config-dhcp-default=dhclient|dhcpcd|internal
                           Default configuration option for main.dhcp setting,
                           used as fallback if the configuration option is
@@ -2042,11 +2040,11 @@ Some influential environment variables:
   POLKIT_CFLAGS
               C compiler flags for POLKIT, overriding pkg-config
   POLKIT_LIBS linker flags for POLKIT, overriding pkg-config
-  NSS_CFLAGS  C compiler flags for NSS, overriding pkg-config
-  NSS_LIBS    linker flags for NSS, overriding pkg-config
   GNUTLS_CFLAGS
               C compiler flags for GNUTLS, overriding pkg-config
   GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
+  NSS_CFLAGS  C compiler flags for NSS, overriding pkg-config
+  NSS_LIBS    linker flags for NSS, overriding pkg-config
   MM_GLIB_CFLAGS
               C compiler flags for MM_GLIB, overriding pkg-config
   MM_GLIB_LIBS
@@ -2138,7 +2136,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.12.4
+NetworkManager configure 1.14.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2911,7 +2909,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.12.4, which was
+It was created by NetworkManager $as_me 1.14.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3295,7 +3293,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-am__api_version='1.15'
+am__api_version='1.16'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3781,7 +3779,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.12.4'
+ VERSION='1.14.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3811,8 +3809,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -3979,7 +3977,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -4056,45 +4054,45 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@@ -17964,9 +17962,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=12
-NM_MICRO_VERSION=4
-NM_VERSION=1.12.4
+NM_MINOR_VERSION=14
+NM_MICRO_VERSION=2
+NM_VERSION=1.14.2
 
 
 
@@ -17974,7 +17972,7 @@ NM_VERSION=1.12.4
 
 
 
-NM_GIT_SHA=2e4ca55635ec40164237074c8c137fbe32584ba2
+NM_GIT_SHA=ef5ada1d1d53b04a468dc44838afb459f85e95e7
 
 if test """" != "no-config-h" ; then
 
@@ -20639,231 +20637,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-
 # Add runstatedir if not specified manually in autoconf < 2.70
 if test -z "$runstatedir"; then :
   runstatedir="$localstatedir/run"
@@ -20915,48 +20688,12 @@ if test "${enable_ifupdown+set}" = set; then :
 fi
 
 # Default alternative plugins by distribution
-if test -z "$enable_ifcfg_rh"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/sysconfig/network-scripts" >&5
-$as_echo_n "checking for /etc/sysconfig/network-scripts... " >&6; }
-if ${ac_cv_file__etc_sysconfig_network_scripts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/sysconfig/network-scripts"; then
-  ac_cv_file__etc_sysconfig_network_scripts=yes
-else
-  ac_cv_file__etc_sysconfig_network_scripts=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_sysconfig_network_scripts" >&5
-$as_echo "$ac_cv_file__etc_sysconfig_network_scripts" >&6; }
-if test "x$ac_cv_file__etc_sysconfig_network_scripts" = xyes; then :
+if test -z "$enable_ifcfg_rh" -a -d /etc/sysconfig/network-scripts; then :
   enable_ifcfg_rh=yes
 fi
-
-fi
-if test -z "$enable_ifupdown"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5
-$as_echo_n "checking for /etc/debian_version... " >&6; }
-if ${ac_cv_file__etc_debian_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/debian_version"; then
-  ac_cv_file__etc_debian_version=yes
-else
-  ac_cv_file__etc_debian_version=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5
-$as_echo "$ac_cv_file__etc_debian_version" >&6; }
-if test "x$ac_cv_file__etc_debian_version" = xyes; then :
+if test -z "$enable_ifupdown" -a -f /etc/debian_version; then :
   enable_ifupdown=yes
 fi
-
-fi
 # Otherwise plugins default to "no"
 if test -z "$enable_ifcfg_rh"; then :
   enable_ifcfg_rh=no
@@ -20964,9 +20701,9 @@ fi
 if test -z "$enable_ifupdown"; then :
   enable_ifupdown=no
 fi
-# Enable ibft by default
+# Disable obsolete ibft plugin by default
 if test -z "$enable_config_plugin_ibft"; then :
-  enable_config_plugin_ibft="yes"
+  enable_config_plugin_ibft="no"
 fi
 # Create automake conditionals
  if test "$enable_config_plugin_ibft" = "yes"; then
@@ -21800,70 +21537,54 @@ else
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
-$as_echo_n "checking for gobject-introspection... " >&6; }
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
 
-        case $enable_introspection in #(
-  no) :
-            found_introspection="no (disabled, use --enable-introspection to enable)"
-     ;; #(
-      yes) :
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
-else
-  as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
-fi
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  found_introspection=yes
-else
-  as_fn_error $? "You need to have gobject-introspection >= 0.9.6 installed to build NetworkManager" "$LINENO" 5
-fi
-     ;; #(
-      auto) :
-            if test -n "$PKG_CONFIG" && \
+    if test "x$enable_introspection" == "xno"; then
+      found_introspection="no"
+    else
+       if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  found_introspection=yes
+
+           INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+           INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+           INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+           INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+           INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+           INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+           INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+           INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $INTROSPECTION_SCANNER works" >&5
+$as_echo_n "checking if $INTROSPECTION_SCANNER works... " >&6; }
+           if CFLAGS="${CFLAGS} -Wno-error" "$INTROSPECTION_SCANNER" --namespace=test --library=c /dev/null --output /dev/null >&5 2>&5; then
+               found_introspection=yes
+           else
+               found_introspection="no (compiler failure -- check config.log)"
+           fi
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+$as_echo "$found_introspection" >&6; }
+
 else
-  found_introspection=no
+  found_introspection="no (not installed)"
 fi
-		enable_introspection=$found_introspection
-     ;; #(
-  *) :
-                as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
-     ;;
-esac
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
-$as_echo "$found_introspection" >&6; }
 
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+       if test "x$enable_introspection" == "xyes"; then
+          if test "x$found_introspection" != "xyes"; then
+              as_fn_error $? "introspection enabled but can't be used" "$LINENO" 5
+          fi
+       elif test "x$enable_introspection" != "xauto"; then
+          as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+       fi
     fi
+
     INTROSPECTION_SCANNER='CFLAGS="${CFLAGS} -Wno-error" '"$INTROSPECTION_SCANNER"
 
 
@@ -23091,6 +22812,10 @@ if test "$have_systemd_logind" = "yes"; then
 $as_echo "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h
 
 	session_tracking="$session_tracking, systemd-logind"
+else
+
+$as_echo "#define SESSION_TRACKING_SYSTEMD 0" >>confdefs.h
+
 fi
 
 if test "$use_elogind" = "yes" -a "$have_systemd_logind" = "yes"; then
@@ -23319,16 +23044,21 @@ if test "$have_elogind" = "yes"; then
 $as_echo "#define SESSION_TRACKING_ELOGIND 1" >>confdefs.h
 
 	session_tracking="$session_tracking, elogind"
+else
+
+$as_echo "#define SESSION_TRACKING_ELOGIND 0" >>confdefs.h
+
 fi
 
 if test "$use_consolekit" = "yes"; then
 
 $as_echo "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h
 
+	session_tracking="$session_tracking, consolekit"
+else
 
-$as_echo "#define CKDB_PATH \"/var/run/ConsoleKit/database\"" >>confdefs.h
+$as_echo "#define SESSION_TRACKING_CONSOLEKIT 0" >>confdefs.h
 
-	session_tracking="$session_tracking, consolekit"
 fi
 session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')"
 
@@ -24523,13 +24253,6 @@ if (test "${enable_teamdctl}" = "yes"); then
 	fi
 	# temporary bug workaround
 	LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'`
-
-$as_echo "#define WITH_TEAMDCTL 1" >>confdefs.h
-
-else
-
-$as_echo "#define WITH_TEAMDCTL 0" >>confdefs.h
-
 fi
  if test "${enable_teamdctl}" = "yes"; then
   WITH_TEAMDCTL_TRUE=
@@ -24707,29 +24430,20 @@ fi
 
 
 
-# Check whether --with-crypto was given.
-if test "${with_crypto+set}" = set; then :
-  withval=$with_crypto; with_crypto=$withval
-else
-  with_crypto=nss
-fi
-
-if test "$with_crypto" = 'nss'; then
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
-$as_echo_n "checking for NSS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
+$as_echo_n "checking for GNUTLS... " >&6; }
 
-if test -n "$NSS_CFLAGS"; then
-    pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+if test -n "$GNUTLS_CFLAGS"; then
+    pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
+  pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.12" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24737,16 +24451,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$NSS_LIBS"; then
-    pkg_cv_NSS_LIBS="$NSS_LIBS"
+if test -n "$GNUTLS_LIBS"; then
+    pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
+  pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.12" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24767,67 +24481,40 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1`
+	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.12" 2>&1`
         else
-	        NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1`
+	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.12" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$NSS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (nss) were not met:
-
-$NSS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+	echo "$GNUTLS_PKG_ERRORS" >&5
 
-Alternatively, you may set the environment variables NSS_CFLAGS
-and NSS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	have_crypto_gnutls=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables NSS_CFLAGS
-and NSS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	have_crypto_gnutls=no
 else
-	NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
-	NSS_LIBS=$pkg_cv_NSS_LIBS
+	GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
+	GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	have_crypto_gnutls=yes
 fi
 
-	# Work around a pkg-config bug (fdo #29801) where exists != usable
-	FOO=`$PKG_CONFIG --cflags --libs nss`
-	if test x"$?" != "x0"; then
-		as_fn_error $? "No usable NSS found" "$LINENO" 5
-	fi
-elif test "$with_crypto" = 'gnutls'; then
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
-$as_echo_n "checking for GNUTLS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
+$as_echo_n "checking for NSS... " >&6; }
 
-if test -n "$GNUTLS_CFLAGS"; then
-    pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+if test -n "$NSS_CFLAGS"; then
+    pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.12" 2>/dev/null`
+  pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24835,16 +24522,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$GNUTLS_LIBS"; then
-    pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
+if test -n "$NSS_LIBS"; then
+    pkg_cv_NSS_LIBS="$NSS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.12" 2>/dev/null`
+  pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24865,45 +24552,65 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.12" 2>&1`
+	        NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1`
         else
-	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.12" 2>&1`
+	        NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GNUTLS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gnutls >= 2.12) were not met:
-
-$GNUTLS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+	echo "$NSS_PKG_ERRORS" >&5
 
-Alternatively, you may set the environment variables GNUTLS_CFLAGS
-and GNUTLS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	have_crypto_nss=yes
 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 GNUTLS_CFLAGS
-and GNUTLS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	have_crypto_nss=yes
 else
-	GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
-	GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
+	NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
+	NSS_LIBS=$pkg_cv_NSS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+	have_crypto_nss=yes
+fi
+if test "${have_crypto_nss}" = "yes"; then
+	# Work around a pkg-config bug (fdo #29801) where exists != usable
+	FOO=`$PKG_CONFIG --cflags --libs nss`
+	if test x"$?" != "x0"; then
+		have_crypto_nss=no
+	fi
+fi
+ if test "${have_crypto_gnutls}" = 'yes'; then
+  HAVE_CRYPTO_GNUTLS_TRUE=
+  HAVE_CRYPTO_GNUTLS_FALSE='#'
+else
+  HAVE_CRYPTO_GNUTLS_TRUE='#'
+  HAVE_CRYPTO_GNUTLS_FALSE=
+fi
 
+ if test "${have_crypto_nss}" = 'yes'; then
+  HAVE_CRYPTO_NSS_TRUE=
+  HAVE_CRYPTO_NSS_FALSE='#'
+else
+  HAVE_CRYPTO_NSS_TRUE='#'
+  HAVE_CRYPTO_NSS_FALSE=
+fi
+
+
+
+# Check whether --with-crypto was given.
+if test "${with_crypto+set}" = set; then :
+  withval=$with_crypto; with_crypto=$withval
+else
+  with_crypto=nss
 fi
+
+if test "$with_crypto" = 'nss'; then
+	if test "${have_crypto_nss}" != "yes"; then
+		as_fn_error $? "No usable NSS found for --with-crypto=nss" "$LINENO" 5
+	fi
+elif test "$with_crypto" = 'gnutls'; then
+	if test "${have_crypto_gnutls}" != "yes"; then
+		as_fn_error $? "No usable gnutls found for --with-crypto=gnutls" "$LINENO" 5
+	fi
 else
 	as_fn_error $? "Please choose either 'nss' or 'gnutls' for certificate and crypto operations" "$LINENO" 5
 fi
@@ -25148,16 +24855,6 @@ fi
 		with_modem_manager_1="yes"
 	fi
 fi
-
-if (test "${with_modem_manager_1}" = "yes"); then
-
-$as_echo "#define WITH_MODEM_MANAGER_1 1" >>confdefs.h
-
-else
-
-$as_echo "#define WITH_MODEM_MANAGER_1 0" >>confdefs.h
-
-fi
  if test "${with_modem_manager_1}" = "yes"; then
   WITH_MODEM_MANAGER_1_TRUE=
   WITH_MODEM_MANAGER_1_FALSE='#'
@@ -25362,7 +25059,10 @@ if test "$with_dhcpcanon" != "no"; then
 
 $as_echo "#define WITH_DHCPCANON 1" >>confdefs.h
 
-    DHCPCANON_PATH=$with_dhcpcanon
+
+cat >>confdefs.h <<_ACEOF
+#define DHCPCANON_PATH "$with_dhcpcanon"
+_ACEOF
 
 else
 
@@ -25381,13 +25081,6 @@ if test "${enable_ovs}" != "no"; then
 	if test "$have_jansson" = "no"; then
 		as_fn_error $? "Jansson is required for ovs support" "$LINENO" 5
 	fi
-
-$as_echo "#define WITH_OPENVSWITCH 1" >>confdefs.h
-
-else
-
-$as_echo "#define WITH_OPENVSWITCH 0" >>confdefs.h
-
 fi
  if test "${enable_ovs}" = "yes"; then
   WITH_OPENVSWITCH_TRUE=
@@ -25460,18 +25153,16 @@ test -n "$with_dhclient" || with_dhclient="no"
 $as_echo "$as_me: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&2;}
 			with_dhclient=/usr/sbin/dhclient
 		fi
-	else
-		if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhclient $with_dhclient is too old, version 4.x or newer is required." >&5
-$as_echo "$as_me: WARNING: Seems version of dhclient $with_dhclient is too old, version 4.x or newer is required." >&2;}
-		fi
 	fi
 fi
 if test "$with_dhclient" != "no"; then
 
 $as_echo "#define WITH_DHCLIENT 1" >>confdefs.h
 
-	DHCLIENT_PATH=$with_dhclient
+
+cat >>confdefs.h <<_ACEOF
+#define DHCLIENT_PATH "$with_dhclient"
+_ACEOF
 
 else
 
@@ -25485,14 +25176,6 @@ if test "${with_dhcpcd+set}" = set; then :
   withval=$with_dhcpcd;
 fi
 
-
-# Check whether --with-dhcpcd-supports-ipv6 was given.
-if test "${with_dhcpcd_supports_ipv6+set}" = set; then :
-  withval=$with_dhcpcd_supports_ipv6; with_dhcpcd_supports_ipv6=$withval
-else
-  with_dhcpcd_supports_ipv6=auto
-fi
-
 if test "$with_dhcpcd" != "no"; then
 	with_dhcpcd_="$with_dhcpcd"
 	for ac_prog in dhcpcd
@@ -25547,46 +25230,17 @@ test -n "$with_dhcpcd" || with_dhcpcd="no"
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&5
 $as_echo "$as_me: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&2;}
 			with_dhcpcd=/usr/sbin/dhcpcd
-			if test "$with_dhcpcd_supports_ipv6" == auto; then
-				with_dhcpcd_supports_ipv6=yes
-			fi
-		fi
-	else
-		if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhcpcd $with_dhcpcd is too old, version 4.x or newer is required" >&5
-$as_echo "$as_me: WARNING: Seems version of dhcpcd $with_dhcpcd is too old, version 4.x or newer is required" >&2;}
-		fi
-	fi
-fi
-if test "$with_dhcpcd" != "no"; then
-	if $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then
-		if test "$with_dhcpcd_supports_ipv6" == no; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhcpcd $with_dhcpcd supports IPv6, but compiling --with-dhcpcd-supports-ipv6=no" >&5
-$as_echo "$as_me: WARNING: Seems version of dhcpcd $with_dhcpcd supports IPv6, but compiling --with-dhcpcd-supports-ipv6=no" >&2;}
-		else
-			with_dhcpcd_supports_ipv6=yes
-		fi
-	else
-		if test "$with_dhcpcd_supports_ipv6" == yes; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhcpcd $with_dhcpcd does not support IPv6, but compiling --with-dhcpcd-supports-ipv6=yes" >&5
-$as_echo "$as_me: WARNING: Seems version of dhcpcd $with_dhcpcd does not support IPv6, but compiling --with-dhcpcd-supports-ipv6=yes" >&2;}
-		else
-			with_dhcpcd_supports_ipv6=no
 		fi
 	fi
-	if test "$with_dhcpcd_supports_ipv6" != no; then
-
-$as_echo "#define DHCPCD_SUPPORTS_IPV6 1" >>confdefs.h
-
-	fi
-else
-	with_dhcpcd_supports_ipv6=no
 fi
 if test "$with_dhcpcd" != "no"; then
 
 $as_echo "#define WITH_DHCPCD 1" >>confdefs.h
 
-	DHCPCD_PATH=$with_dhcpcd
+
+cat >>confdefs.h <<_ACEOF
+#define DHCPCD_PATH "$with_dhcpcd"
+_ACEOF
 
 else
 
@@ -25617,7 +25271,6 @@ _ACEOF
 NM_CONFIG_DEFAULT_MAIN_DHCP=$config_dhcp_default
 
 
-# resolvconf and netconfig support
 
 # Check whether --with-resolvconf was given.
 if test "${with_resolvconf+set}" = set; then :
@@ -25636,9 +25289,9 @@ 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 \
+if test "$config_dns_rc_manager_default" != "" -a \
         "$config_dns_rc_manager_default" != file -a \
-        "$config_dns_rc_manager_default" != "" -a \
+        "$config_dns_rc_manager_default" != symlink -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
@@ -25646,27 +25299,9 @@ $as_echo "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_
 	config_dns_rc_manager_default=
 fi
 # Use netconfig by default on SUSE
-if test -z "$with_netconfig"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5
-$as_echo_n "checking for /etc/SuSE-release... " >&6; }
-if ${ac_cv_file__etc_SuSE_release+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/etc/SuSE-release"; then
-  ac_cv_file__etc_SuSE_release=yes
-else
-  ac_cv_file__etc_SuSE_release=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5
-$as_echo "$ac_cv_file__etc_SuSE_release" >&6; }
-if test "x$ac_cv_file__etc_SuSE_release" = xyes; then :
+if test -z "$with_netconfig" -a -f /etc/SuSE-release; then :
   with_netconfig=yes
 fi
-
-fi
 # Otherwise default to "no"
 if test -z "$with_resolvconf"; then :
   with_resolvconf=no
@@ -25674,7 +25309,7 @@ fi
 if test -z "$with_netconfig"; then :
   with_netconfig=no
 fi
-# Find resolvconf and netconfig
+
 if test "$with_resolvconf" = "yes"; then
 	for ac_prog in resolvconf
 do
@@ -25721,14 +25356,18 @@ fi
 
   test -n "$with_resolvconf" && break
 done
-test -n "$with_resolvconf" || with_resolvconf="no"
+test -n "$with_resolvconf" || with_resolvconf="'yes'"
 
+	if test "$with_resolvconf" = "yes"; then
+		as_fn_error $? "cannot find resolvconf in path. Set the path explicitly via --with-resolvconf=PATH." "$LINENO" 5
+	fi
 fi
 if test "$with_resolvconf" != "no"; then
 	if test -z "$config_dns_rc_manager_default"; then :
   config_dns_rc_manager_default=resolvconf
 fi
 fi
+
 if test "$with_netconfig" = "yes"; then
 	for ac_prog in netconfig
 do
@@ -25775,18 +25414,22 @@ fi
 
   test -n "$with_netconfig" && break
 done
-test -n "$with_netconfig" || with_netconfig="no"
+test -n "$with_netconfig" || with_netconfig="yes"
 
+	if test "$with_netconfig" = "yes"; then
+		as_fn_error $? "cannot find netconfig in path. Set the path explicitly via --with-netconfig=PATH." "$LINENO" 5
+	fi
 fi
 if test "$with_netconfig" != "no"; then
 	if test -z "$config_dns_rc_manager_default"; then :
   config_dns_rc_manager_default=netconfig
 fi
 fi
+
 if test -z "$config_dns_rc_manager_default"; then :
   config_dns_rc_manager_default=symlink
 fi
-# Define resolvconf and netconfig paths
+
 if test "$with_resolvconf" != "no"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -25942,12 +25585,12 @@ if test "x${with_dnssec_trigger}" = x; then
 set dummy dnssec-trigger-script; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DNSSEC_TRIGGER_SCRIPT+:} false; then :
+if ${ac_cv_path_DNSSEC_TRIGGER_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $DNSSEC_TRIGGER_SCRIPT in
+  case $DNSSEC_TRIGGER_PATH in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_DNSSEC_TRIGGER_SCRIPT="$DNSSEC_TRIGGER_SCRIPT" # Let the user override the test with a path.
+  ac_cv_path_DNSSEC_TRIGGER_PATH="$DNSSEC_TRIGGER_PATH" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -25958,7 +25601,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DNSSEC_TRIGGER_SCRIPT="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_DNSSEC_TRIGGER_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -25966,14 +25609,14 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_DNSSEC_TRIGGER_SCRIPT" && ac_cv_path_DNSSEC_TRIGGER_SCRIPT="/usr/libexec/dnssec-trigger-script"
+  test -z "$ac_cv_path_DNSSEC_TRIGGER_PATH" && ac_cv_path_DNSSEC_TRIGGER_PATH="/usr/libexec/dnssec-trigger-script"
   ;;
 esac
 fi
-DNSSEC_TRIGGER_SCRIPT=$ac_cv_path_DNSSEC_TRIGGER_SCRIPT
-if test -n "$DNSSEC_TRIGGER_SCRIPT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSSEC_TRIGGER_SCRIPT" >&5
-$as_echo "$DNSSEC_TRIGGER_SCRIPT" >&6; }
+DNSSEC_TRIGGER_PATH=$ac_cv_path_DNSSEC_TRIGGER_PATH
+if test -n "$DNSSEC_TRIGGER_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSSEC_TRIGGER_PATH" >&5
+$as_echo "$DNSSEC_TRIGGER_PATH" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -25981,11 +25624,11 @@ fi
 
 
 else
-	DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger"
+	DNSSEC_TRIGGER_PATH="$with_dnssec_trigger"
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define DNSSEC_TRIGGER_SCRIPT "$DNSSEC_TRIGGER_SCRIPT"
+#define DNSSEC_TRIGGER_PATH "$DNSSEC_TRIGGER_PATH"
 _ACEOF
 
 
@@ -26679,7 +26322,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-	CFLAGS_MORE_WARNINGS="-Wall -std=gnu99"
+	CFLAGS_MORE_WARNINGS="-Wall"
 
 	if test "x$set_more_warnings" = xerror; then
 		CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
@@ -26714,9 +26357,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		      ; do
 
 	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; }
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wall $(printf '%s' "$option" | sed 's/^-Wno-/-W/')"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wall $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected" >&5
+$as_echo_n "checking whether -Wall $(printf '%s' \"$option\" | sed 's/^-Wno-/-W/') works as expected... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27221,6 +26864,10 @@ if test "${enable_more_logging}" = "yes"; then
 
 $as_echo "#define NM_MORE_LOGGING 1" >>confdefs.h
 
+else
+
+$as_echo "#define NM_MORE_LOGGING 0" >>confdefs.h
+
 fi
 
 # Check whether --enable-lto was given.
@@ -27843,7 +27490,7 @@ NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-fr
 
         # Find any Python interpreter.
     if test -z "$PYTHON"; then
-      for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+      for ac_prog in python python2 python3  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 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
@@ -28524,7 +28171,7 @@ else
 	if test "$enable_gtk_doc" = "yes"; then
 		# large parts of the documentation require introspection/pygobject to extract
 		# the documentation out of the source files. You cannot enable gtk-doc without alone.
-		as_fn_error $? "\"--with-gtk-doc requires --enable-introspection\"" "$LINENO" 5
+		as_fn_error $? "\"--enable-gtk-doc requires --enable-introspection\"" "$LINENO" 5
 	fi
 	have_introspection=no
 fi
@@ -28721,7 +28368,6 @@ fi
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
-
 if test -z "${CONFIG_PLUGIN_IBFT_TRUE}" && test -z "${CONFIG_PLUGIN_IBFT_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_PLUGIN_IBFT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28794,6 +28440,14 @@ if test -z "${WITH_POLKIT_AGENT_TRUE}" && test -z "${WITH_POLKIT_AGENT_FALSE}";
   as_fn_error $? "conditional \"WITH_POLKIT_AGENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_CRYPTO_GNUTLS_TRUE}" && test -z "${HAVE_CRYPTO_GNUTLS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CRYPTO_GNUTLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_CRYPTO_NSS_TRUE}" && test -z "${HAVE_CRYPTO_NSS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CRYPTO_NSS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_NSS_TRUE}" && test -z "${WITH_NSS_FALSE}"; then
   as_fn_error $? "conditional \"WITH_NSS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29275,7 +28929,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.12.4, which was
+This file was extended by NetworkManager $as_me 1.14.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29341,7 +28995,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.12.4
+NetworkManager config.status 1.14.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -29460,7 +29114,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -30480,29 +30134,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -30520,53 +30180,48 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\).*/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; 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 $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "libtool":C)
@@ -31488,7 +31143,7 @@ echo
 echo "Features:"
 echo "  wext: $ac_with_wext"
 echo "  wifi: $enable_wifi"
-echo "  ppp: $enable_ppp ${PPPD_PLUGIN_DIR}"
+echo "  ppp: $enable_ppp ${PPPD_PATH} plugins:${PPPD_PLUGIN_DIR}"
 echo "  modemmanager-1: $with_modem_manager_1"
 echo "  ofono: $with_ofono"
 echo "  concheck: $enable_concheck"
@@ -31516,7 +31171,6 @@ echo "DHCP clients (default $config_dhcp_default):"
 echo "  dhcpcanon: $with_dhcpcanon"
 echo "  dhclient: $with_dhclient"
 echo "  dhcpcd: $with_dhcpcd"
-echo "  dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6"
 echo
 
 echo "Miscellaneous:"
@@ -31532,7 +31186,7 @@ echo "  code coverage: $enable_code_coverage"
 echo "  LTO: $enable_lto"
 echo "  linker garbage collection: $enable_ld_gc"
 echo "  JSON validation for libnm: $enable_json_validation"
-echo "  crypto: $with_crypto"
+echo "  crypto: $with_crypto (have-gnutls: $have_crypto_gnutls, have-nss: $have_crypto_nss)"
 echo "  sanitizers: $sanitizers"
 echo "  Mozilla Public Suffix List: $with_libpsl"
 echo