Imported Upstream version 1.0.4upstream/1.0.4

1 files changed, 332 insertions, 29 deletions

diff --git a/configure b/configure
index 53d73d47c..363895c29 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.4.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='NetworkManager 1.0.2'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='NetworkManager 1.0.4'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -791,6 +791,8 @@ INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
 GUDEV_LIBS
 GUDEV_CFLAGS
+AM_TESTS_FD_REDIRECT
+LOG_DRIVER
 GLIB_LIBS
 GLIB_CFLAGS
 HAVE_DBUS_GLIB_100_FALSE
@@ -806,6 +808,8 @@ LIBDL
 LIBM
 WITH_WEXT_FALSE
 WITH_WEXT_TRUE
+WITH_WIFI_FALSE
+WITH_WIFI_TRUE
 GNOME_CODE_COVERAGE_RULES
 CODE_COVERAGE_LDFLAGS
 CODE_COVERAGE_CFLAGS
@@ -1029,6 +1033,7 @@ enable_ifnet
 with_config_plugins_default
 enable_code_coverage
 with_dist_version
+enable_wifi
 with_wext
 enable_introspection
 enable_qt
@@ -1062,11 +1067,14 @@ with_libsoup
 enable_concheck
 with_nmtui
 enable_more_warnings
+enable_more_asserts
+enable_more_logging
 enable_lto
 enable_vala
 enable_tests
 with_valgrind
 with_tests
+with_valgrind_suppressions
 with_html_dir
 enable_gtk_doc
 enable_gtk_doc_html
@@ -1672,7 +1680,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 1.0.2 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1742,7 +1750,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.0.2:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1773,6 +1781,7 @@ Optional Features:
   --enable-ifupdown       enable ifupdown configuration plugin (Debian/Ubuntu)
   --enable-ifnet          enable ifnet configuration plugin (Gentoo)
   --enable-code-coverage  Whether to enable code coverage support
+  --enable-wifi           enable Wi-Fi support
   --enable-introspection=[no/auto/yes]
                           Enable introspection for this build
   --enable-qt             enable Qt examples
@@ -1789,6 +1798,8 @@ Optional Features:
   --enable-bluez5-dun     enable Bluez5 DUN support
   --enable-concheck       enable connectivity checking support
   --enable-more-warnings  Possible values: no/yes/error
+  --enable-more-asserts   Enable more assertions for debugging (default: no)
+  --enable-more-logging   Enable more debug logging (default: no)
   --enable-lto            Enable Link Time Optimization for smaller size
                           (default: no)
   --enable-vala=[no/auto/yes]
@@ -1863,6 +1874,8 @@ Optional Packages:
   --with-valgrind=yes|no|path
                           Use valgrind to memory-check the tests (default: no)
   --with-tests            Build NetworkManager tests (deprecated)
+  --with-valgrind-suppressions=path
+                          Use specific valgrind suppression file
   --with-html-dir=PATH    path to installed docs
 
 Some influential environment variables:
@@ -2019,7 +2032,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.0.2
+NetworkManager configure 1.0.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2563,7 +2576,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.0.2, which was
+It was created by NetworkManager $as_me 1.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3433,7 +3446,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.0.2'
+ VERSION='1.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16718,9 +16731,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=0
-NM_MICRO_VERSION=2
-NM_VERSION=1.0.2
-NM_GIT_SHA=4e6481cb733611543d22e06831db63b0e23af3f9
+NM_MICRO_VERSION=4
+NM_VERSION=1.0.4
+NM_GIT_SHA=f27429138ff951309556c30c67e2f34e7ed29281
 
 
 
@@ -19923,15 +19936,45 @@ _ACEOF
 
 fi
 
+# Check whether --enable-wifi was given.
+if test "${enable_wifi+set}" = set; then :
+  enableval=$enable_wifi;
+fi
+
+if test "${enable_wifi}" != "no"; then
+	enable_wifi='yes'
+
+$as_echo "#define WITH_WIFI 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_WIFI 0" >>confdefs.h
+
+fi
+ if test "${enable_wifi}" = "yes"; then
+  WITH_WIFI_TRUE=
+  WITH_WIFI_FALSE='#'
+else
+  WITH_WIFI_TRUE='#'
+  WITH_WIFI_FALSE=
+fi
+
+
 
 # Check whether --with-wext was given.
 if test "${with_wext+set}" = set; then :
   withval=$with_wext; ac_with_wext=$withval
 else
-  ac_with_wext="yes"
+  ac_with_wext="$enable_wifi"
 fi
 
+if test "$ac_with_wext" != 'no'; then
+	ac_with_wext='yes'
+fi
 if test x"$ac_with_wext" = x"yes"; then
+	if test "$enable_wifi" != "yes"; then
+		as_fn_error $? "Enabling WEXT support and disabling Wi-Fi makes no sense" "$LINENO" 5
+	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel WEXT headers" >&5
 $as_echo_n "checking Linux kernel WEXT headers... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20012,17 +20055,18 @@ if test "$ac_have_nl80211" = no; then
 	as_fn_error $? "Linux kernel development header linux/nl80211.h not installed or not functional" "$LINENO" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 Critical Protocol Start/Stop" >&5
+if test "$with_wifi" = "yes"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 Critical Protocol Start/Stop" >&5
 $as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __user
-                #define __user
-                #endif
-                #include <sys/types.h>
-                #include <linux/types.h>
-                #include <sys/socket.h>
-                #include <linux/nl80211.h>
+                    #define __user
+                    #endif
+                    #include <sys/types.h>
+                    #include <linux/types.h>
+                    #include <sys/socket.h>
+                    #include <linux/nl80211.h>
 int
 main ()
 {
@@ -20037,8 +20081,11 @@ else
   ac_have_nl80211_critproto=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211_critproto" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211_critproto" >&5
 $as_echo "$ac_have_nl80211_critproto" >&6; }
+else
+	ac_have_nl80211_critproto='no'
+fi
 if test "$ac_have_nl80211_critproto" = yes; then
 
 $as_echo "#define HAVE_NL80211_CRITICAL_PROTOCOL_CMDS 1" >>confdefs.h
@@ -20622,6 +20669,65 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.37.6 gmodule-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLIB_LIBS"; then
+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.37.6 gmodule-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 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
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>&1`
+        else
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLIB_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
+
+if test -n "$GLIB_CFLAGS"; then
+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
   ac_status=$?
@@ -20704,6 +20810,114 @@ else
 $as_echo "yes" >&6; }
 
 fi
+	 LOG_DRIVER='$(top_srcdir)/build-aux/test-driver'
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
+
+if test -n "$GLIB_CFLAGS"; then
+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLIB_LIBS"; then
+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 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
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1`
+        else
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLIB_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.32 gmodule-2.0) were not met:
+
+$GLIB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GLIB_CFLAGS
+and GLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GLIB_CFLAGS
+and GLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+	 LOG_DRIVER='$(top_srcdir)/build-aux/test-driver'
+
+else
+	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	LOG_DRIVER='$(top_srcdir)/build-aux/tap-driver.sh'
+,
+	 AM_TESTS_FD_REDIRECT='--tap'
+
+fi
 
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
 
@@ -22077,6 +22291,55 @@ $as_echo "#define HAVE_KERNEL_INET6_ADDR_GEN_MODE 0" >>confdefs.h
 
 fi
 
+# IPv6 tokenized identifiers support in libnl
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rtnl_link_inet6_get_token in -lnl-route-3" >&5
+$as_echo_n "checking for rtnl_link_inet6_get_token in -lnl-route-3... " >&6; }
+if ${ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnl-route-3  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rtnl_link_inet6_get_token ();
+int
+main ()
+{
+return rtnl_link_inet6_get_token ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token=yes
+else
+  ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" >&5
+$as_echo "$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" >&6; }
+if test "x$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" = xyes; then :
+  ac_have_ipv6_token="1"
+else
+  ac_have_ipv6_token="0"
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNL_INET6_TOKEN $ac_have_ipv6_token
+_ACEOF
+
+
 # uuid library
 
 pkg_failed=no
@@ -22227,7 +22490,7 @@ fi
 $as_echo "$ax_cv_lib_readline" >&6; }
 
   if test -z "$ax_cv_lib_readline"; then
-    as_fn_error $? "readline library with terminfo support is required (one of ncurses, curses, or termcap)" "$LINENO" 5
+    as_fn_error $? "readline library with terminfo support is required (one of readline, edit, or editline, AND one of ncurses, curses, or termcap)" "$LINENO" 5
   fi
 
   ORIG_LIBS="$LIBS"
@@ -23524,11 +23787,11 @@ done
 test -n "$with_dhcpcd" || with_dhcpcd="no"
 
 	if test "$with_dhcpcd" != "no"; then
-		if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd 456789\."; then
+		if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&5
 $as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&2;}
 			with_dhcpcd=no
-		elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd 6789\."; then
+		elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then
 
 $as_echo "#define DHCPCD_SUPPORTS_IPV6 1" >>confdefs.h
 
@@ -24202,7 +24465,7 @@ fi
 if test "${enable_more_warnings+set}" = set; then :
   enableval=$enable_more_warnings; set_more_warnings="$enableval"
 else
-  set_more_warnings=error
+  set_more_warnings=yes
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5
@@ -24532,6 +24795,28 @@ $as_echo "no" >&6; }
 fi
 
 
+# Check whether --enable-more-asserts was given.
+if test "${enable_more_asserts+set}" = set; then :
+  enableval=$enable_more_asserts;
+fi
+
+if test "${enable_more_asserts}" = "yes"; then
+
+$as_echo "#define NM_MORE_ASSERTS 1" >>confdefs.h
+
+fi
+
+# Check whether --enable-more-logging was given.
+if test "${enable_more_logging+set}" = set; then :
+  enableval=$enable_more_logging;
+fi
+
+if test "${enable_more_logging}" = "yes"; then
+
+$as_echo "#define NM_MORE_LOGGING 1" >>confdefs.h
+
+fi
+
 # Check whether --enable-lto was given.
 if test "${enable_lto+set}" = set; then :
   enableval=$enable_lto;
@@ -24884,8 +25169,21 @@ else
   REQUIRE_ROOT_TESTS_FALSE=
 fi
 
+
+# Check whether --with-valgrind-suppressions was given.
+if test "${with_valgrind_suppressions+set}" = set; then :
+  withval=$with_valgrind_suppressions;
+fi
+
+if test "$with_valgrind" == no; then
+	with_valgrind_suppressions=
+else
+	if test  "$with_valgrind_suppressions" == ""; then
+		with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions'
+	fi
+fi
 if test "$with_valgrind" != "no"; then :
-  VALGRIND_RULES='TESTS_ENVIRONMENT = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" "$(top_srcdir)/valgrind.suppressions"'
+  VALGRIND_RULES='LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"
 
 fi
  if test "${with_valgrind}" != "no"; then
@@ -25572,6 +25870,10 @@ if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_F
   as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_WIFI_TRUE}" && test -z "${WITH_WIFI_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_WIFI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then
   as_fn_error $? "conditional \"WITH_WEXT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26113,7 +26415,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 1.0.2, which was
+This file was extended by NetworkManager $as_me 1.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26179,7 +26481,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 1.0.2
+NetworkManager config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -28625,6 +28927,7 @@ echo
 
 echo "Features:"
 echo "  wext: $ac_with_wext"
+echo "  wifi: $enable_wifi"
 echo "  wimax: $enable_wimax"
 echo "  ppp: $enable_ppp"
 echo "  modemmanager-1: $with_modem_manager_1"
@@ -28654,7 +28957,7 @@ echo
 echo "Miscellaneous:"
 echo "  documentation: $enable_gtk_doc"
 echo "  tests: $enable_tests"
-echo "  valgrind: $with_valgrind"
+echo "  valgrind: $with_valgrind   $with_valgrind_suppressions"
 echo "  code coverage: $enable_code_coverage"
 echo "  LTO: $enable_lto"
 echo