Imported Upstream version 0.9.7.997upstream/0.9.7.997

1 files changed, 52 insertions, 386 deletions

diff --git a/configure b/configure
index 923fa9234..0ef7b0018 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.68 for NetworkManager 0.9.7.995.
+# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.7.997.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -571,8 +571,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='0.9.7.995'
-PACKAGE_STRING='NetworkManager 0.9.7.995'
+PACKAGE_VERSION='0.9.7.997'
+PACKAGE_STRING='NetworkManager 0.9.7.997'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -692,12 +692,6 @@ UUID_LIBS
 UUID_CFLAGS
 LIBNL_LIBS
 LIBNL_CFLAGS
-LIBNL1_LIBS
-LIBNL1_CFLAGS
-LIBNL2_LIBS
-LIBNL2_CFLAGS
-LIBNL3_LIBS
-LIBNL3_CFLAGS
 SUSPEND_RESUME_SYSTEMD_FALSE
 SUSPEND_RESUME_SYSTEMD_TRUE
 SUSPEND_RESUME_UPOWER_FALSE
@@ -970,7 +964,6 @@ with_udev_dir
 with_systemdsystemunitdir
 with_session_tracking
 with_suspend_resume
-with_libnl
 enable_wimax
 enable_polkit
 enable_modify_system
@@ -986,7 +979,6 @@ with_netconfig
 with_iptables
 with_system_ca_path
 with_kernel_firmware_dir
-enable_crashtrace
 enable_concheck
 enable_more_warnings
 enable_vala
@@ -1027,12 +1019,8 @@ SYSTEMD_LOGIN_CFLAGS
 SYSTEMD_LOGIN_LIBS
 SYSTEMD_INHIBIT_CFLAGS
 SYSTEMD_INHIBIT_LIBS
-LIBNL3_CFLAGS
-LIBNL3_LIBS
-LIBNL2_CFLAGS
-LIBNL2_LIBS
-LIBNL1_CFLAGS
-LIBNL1_LIBS
+LIBNL_CFLAGS
+LIBNL_LIBS
 UUID_CFLAGS
 UUID_LIBS
 IWMX_SDK_CFLAGS
@@ -1591,7 +1579,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 0.9.7.995 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 0.9.7.997 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1661,7 +1649,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 0.9.7.995:";;
+     short | recursive ) echo "Configuration of NetworkManager 0.9.7.997:";;
    esac
   cat <<\_ACEOF
 
@@ -1694,7 +1682,6 @@ Optional Features:
   --enable-polkit         enable PolicyKit support
   --enable-modify-system  Allow users to modify system connections
   --enable-ppp            enable PPP/PPPoE support
-  --disable-crashtrace    Disable GNU backtrace extensions
   --enable-concheck       enable connectivity checking support
   --enable-more-warnings  Possible values: no/yes/error
   --enable-vala=[no/auto/yes]
@@ -1731,7 +1718,6 @@ Optional Packages:
   --with-suspend-resume=upower|systemd
                           Build NetworkManager with specific suspend/resume
                           support
-  --with-libnl=1|2|3      Select libnl version (default: latest available)
   --with-crypto=nss|gnutls
                           Cryptography library to use for certificate and key
                           operations
@@ -1791,15 +1777,9 @@ Some influential environment variables:
               C compiler flags for SYSTEMD_INHIBIT, overriding pkg-config
   SYSTEMD_INHIBIT_LIBS
               linker flags for SYSTEMD_INHIBIT, overriding pkg-config
-  LIBNL3_CFLAGS
-              C compiler flags for LIBNL3, overriding pkg-config
-  LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config
-  LIBNL2_CFLAGS
-              C compiler flags for LIBNL2, overriding pkg-config
-  LIBNL2_LIBS linker flags for LIBNL2, overriding pkg-config
-  LIBNL1_CFLAGS
-              C compiler flags for LIBNL1, overriding pkg-config
-  LIBNL1_LIBS linker flags for LIBNL1, overriding pkg-config
+  LIBNL_CFLAGS
+              C compiler flags for LIBNL, overriding pkg-config
+  LIBNL_LIBS  linker flags for LIBNL, overriding pkg-config
   UUID_CFLAGS C compiler flags for UUID, overriding pkg-config
   UUID_LIBS   linker flags for UUID, overriding pkg-config
   IWMX_SDK_CFLAGS
@@ -1893,7 +1873,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 0.9.7.995
+NetworkManager configure 0.9.7.997
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2437,7 +2417,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 0.9.7.995, which was
+It was created by NetworkManager $as_me 0.9.7.997, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3258,7 +3238,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='0.9.7.995'
+ VERSION='0.9.7.997'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16461,7 +16441,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 NM_MAJOR_VERSION=0
 NM_MINOR_VERSION=9
 NM_MICRO_VERSION=7
-NM_VERSION=0.9.7.995
+NM_VERSION=0.9.7.997
 
 
 
@@ -20232,54 +20212,6 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_glib_global_set_disable_legacy_property_access in -ldbus-glib-1" >&5
-$as_echo_n "checking for dbus_glib_global_set_disable_legacy_property_access in -ldbus-glib-1... " >&6; }
-if ${ac_cv_lib_dbus_glib_1_dbus_glib_global_set_disable_legacy_property_access+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldbus-glib-1  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dbus_glib_global_set_disable_legacy_property_access ();
-int
-main ()
-{
-return dbus_glib_global_set_disable_legacy_property_access ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dbus_glib_1_dbus_glib_global_set_disable_legacy_property_access=yes
-else
-  ac_cv_lib_dbus_glib_1_dbus_glib_global_set_disable_legacy_property_access=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbus_glib_1_dbus_glib_global_set_disable_legacy_property_access" >&5
-$as_echo "$ac_cv_lib_dbus_glib_1_dbus_glib_global_set_disable_legacy_property_access" >&6; }
-if test "x$ac_cv_lib_dbus_glib_1_dbus_glib_global_set_disable_legacy_property_access" = xyes; then :
-  ac_have_dg_prop="1"
-else
-  ac_have_dg_prop="0"
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS $ac_have_dg_prop
-_ACEOF
-
-
 
 
 
@@ -21251,48 +21183,36 @@ fi
 
 # libnl support for the linux platform
 
-# Check whether --with-libnl was given.
-if test "${with_libnl+set}" = set; then :
-  withval=$with_libnl;
-fi
-
-# default to "yes"
-if test -z "$with_libnl"; then :
-  with_libnl=yes
-fi
-# test for various libnl versions
-if test "$with_libnl" = "yes" -o "$with_libnl" = "3"; then
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5
-$as_echo_n "checking for LIBNL3... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL" >&5
+$as_echo_n "checking for LIBNL... " >&6; }
 
-if test -n "$LIBNL3_CFLAGS"; then
-    pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS"
+if test -n "$LIBNL_CFLAGS"; then
+    pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-route-3.0 libnl-genl-3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBNL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null`
+  pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBNL3_LIBS"; then
-    pkg_cv_LIBNL3_LIBS="$LIBNL3_LIBS"
+if test -n "$LIBNL_LIBS"; then
+    pkg_cv_LIBNL_LIBS="$LIBNL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-route-3.0 libnl-genl-3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBNL3_LIBS=`$PKG_CONFIG --libs "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null`
+  pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -21312,291 +21232,51 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBNL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>&1`
+	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1`
         else
-	        LIBNL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>&1`
+	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL3_PKG_ERRORS" >&5
+	echo "$LIBNL_PKG_ERRORS" >&5
 
-	test "$with_libnl" = "3" && with_libnl=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	test "$with_libnl" = "3" && with_libnl=no
-else
-	LIBNL3_CFLAGS=$pkg_cv_LIBNL3_CFLAGS
-	LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	with_libnl=3
-fi
-	if test "$with_libnl" = "no"; then :
-  as_fn_error $? "libnl 3.x could not be found" "$LINENO" 5
-fi
-fi
-if test "$with_libnl" = "yes" -o "$with_libnl" = "2"; then
+	as_fn_error $? "Package requirements (libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0) were not met:
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL2" >&5
-$as_echo_n "checking for LIBNL2... " >&6; }
+$LIBNL_PKG_ERRORS
 
-if test -n "$LIBNL2_CFLAGS"; then
-    pkg_cv_LIBNL2_CFLAGS="$LIBNL2_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL2_CFLAGS=`$PKG_CONFIG --cflags "libnl-2.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBNL2_LIBS"; then
-    pkg_cv_LIBNL2_LIBS="$LIBNL2_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL2_LIBS=`$PKG_CONFIG --libs "libnl-2.0" 2>/dev/null`
-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; }
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-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
-	        LIBNL2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-2.0" 2>&1`
-        else
-	        LIBNL2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL2_PKG_ERRORS" >&5
+Alternatively, you may set the environment variables LIBNL_CFLAGS
+and LIBNL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
 
-	test "$with_libnl" = "2" && with_libnl=no
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	test "$with_libnl" = "2" && with_libnl=no
-else
-	LIBNL2_CFLAGS=$pkg_cv_LIBNL2_CFLAGS
-	LIBNL2_LIBS=$pkg_cv_LIBNL2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	with_libnl=2
-fi
-	if test "$with_libnl" = "no"; then :
-  as_fn_error $? "libnl 2.x could not be found" "$LINENO" 5
-fi
-fi
-if test "$with_libnl" = "yes" -o "$with_libnl" = "1"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL1" >&5
-$as_echo_n "checking for LIBNL1... " >&6; }
-
-if test -n "$LIBNL1_CFLAGS"; then
-    pkg_cv_LIBNL1_CFLAGS="$LIBNL1_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-1 >= 1.0-pre8\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-1 >= 1.0-pre8") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL1_CFLAGS=`$PKG_CONFIG --cflags "libnl-1 >= 1.0-pre8" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBNL1_LIBS"; then
-    pkg_cv_LIBNL1_LIBS="$LIBNL1_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-1 >= 1.0-pre8\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnl-1 >= 1.0-pre8") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNL1_LIBS=`$PKG_CONFIG --libs "libnl-1 >= 1.0-pre8" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
+	{ { $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.
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+Alternatively, you may set the environment variables LIBNL_CFLAGS
+and LIBNL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-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
-	        LIBNL1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-1 >= 1.0-pre8" 2>&1`
-        else
-	        LIBNL1_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-1 >= 1.0-pre8" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL1_PKG_ERRORS" >&5
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
 
-	test "$with_libnl" = "1" && with_libnl=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	test "$with_libnl" = "1" && with_libnl=no
 else
-	LIBNL1_CFLAGS=$pkg_cv_LIBNL1_CFLAGS
-	LIBNL1_LIBS=$pkg_cv_LIBNL1_LIBS
+	LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS
+	LIBNL_LIBS=$pkg_cv_LIBNL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	with_libnl=1
-fi
-	if test "$with_libnl" = "no"; then :
-  as_fn_error $? "libnl 1.x could not be found" "$LINENO" 5
-fi
-fi
-if test "$with_libnl" = "yes"; then
-	as_fn_error $? "libnl library could not be found" "$LINENO" 5
-	with_libnl=no
-fi
-if ! echo "$with_libnl" | grep -q "^[1-3]$"; then
-	as_fn_error $? "unsupported libnl version: $with_libnl" "$LINENO" 5
-fi
-# add variables, conditionals and defines
-if test "$with_libnl" != "no"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNL $with_libnl
-_ACEOF
-
-	LIBNL_CFLAGS="$LIBNL3_CFLAGS$LIBNL2_CFLAGS$LIBNL1_CFLAGS"
-
-	LIBNL_LIBS="$LIBNL3_LIBS$LIBNL2_LIBS$LIBNL1_LIBS"
-
-fi
-# additional tests
-if test "with_libnl" = "1"; then
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl address caching bug" >&5
-$as_echo_n "checking for libnl address caching bug... " >&6; }
-    save_CFLAGS="$CFLAGS"
-    save_LDFLAGS="$LDFLAGS"
-    CFLAGS="$CFLAGS $LIBNL_CFLAGS"
-    LDFLAGS="$LDFLAGS $LIBNL_LIBS"
-    if test "$cross_compiling" = yes; then :
-  libnl_bug=cross
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <netlink/route/addr.h>
-#include <netlink/object-api.h>
-
-int
-main ()
-{
-
-	struct nl_handle *nlh;
-	struct nl_cache *cache;
-	struct nl_object *obj;
 
-	nlh = nl_handle_alloc ();
-	if (nl_connect (nlh, NETLINK_ROUTE) < 0) {
-		fprintf (stderr, "couldn't connect to netlink: %s", nl_geterror ());
-		return 3;
-	}
-
-	cache = rtnl_addr_alloc_cache (nlh);
-	if (!cache || nl_cache_nitems (cache) == 0) {
-		fprintf (stderr, "couldn't fill address cache: %s", nl_geterror ());
-		return 3;
-	}
-
-	obj = nl_cache_get_first (cache);
-	if (nl_object_identical (obj, obj))
-		return 0;
-
-	nl_cache_get_ops (cache)->co_obj_ops->oo_id_attrs &= ~0x80;
-	if (nl_object_identical (obj, obj))
-		return 1;
-	else
-		return 2;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  libnl_bug=$?
-else
-  libnl_bug=$?
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-    CFLAGS="$save_CFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-
-    case $libnl_bug in
-    0) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       ;;
-
-    1) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using workaround" >&5
-$as_echo "yes, using workaround" >&6; }
-
-$as_echo "#define LIBNL_NEEDS_ADDR_CACHING_WORKAROUND 1" >>confdefs.h
-
-       ;;
 
-    2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, and workaround doesn't work" >&5
-$as_echo "yes, and workaround doesn't work" >&6; }
-       as_fn_error $? "Installed libnl has broken address caching; please patch or upgrade" "$LINENO" 5
-       ;;
 
-    cross) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling... assuming it works!" >&5
-$as_echo "cross-compiling... assuming it works!" >&6; }
-           ;;
-
-    *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: ?" >&5
-$as_echo "?" >&6; }
-       as_fn_error $? "libnl test program failed" "$LINENO" 5
-       ;;
-esac
-
-fi
 
+# uuid library
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
@@ -22827,19 +22507,6 @@ _ACEOF
 
 
 
-# Check whether --enable-crashtrace was given.
-if test "${enable_crashtrace+set}" = set; then :
-  enableval=$enable_crashtrace; enable_crashtrace=${enableval}
-else
-  enable_crashtrace=yes
-fi
-
-if test x"$enable_crashtrace" = xyes; then
-
-$as_echo "#define ENABLE_CRASHTRACE 1" >>confdefs.h
-
-fi
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
@@ -24301,7 +23968,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 0.9.7.995, which was
+This file was extended by NetworkManager $as_me 0.9.7.997, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24367,7 +24034,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 0.9.7.995
+NetworkManager config.status 0.9.7.997
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -26645,11 +26312,10 @@ echo "  nmrundir: $nmrundir"
 echo
 
 echo "Platform:"
-echo "  libnl: $with_libnl"
 echo "  session tracking: $with_session_tracking"
 echo "  suspend/resume: $with_suspend_resume"
 if test "${enable_polkit}" = "yes"; then
-	if test "${enable_modify_system}"; then
+	if test "${enable_modify_system}" = "yes"; then
 		echo "  policykit: yes (permissive modify.system)"
 	else
 		echo "  policykit: yes (restrictive modify.system)"