New upstream version 1.10.6 upstream/1.10.6

1 files changed, 64 insertions, 27 deletions

diff --git a/configure b/configure
index 76b4d9bc..1c554bee 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.10.4.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.10.6.
 #
 # 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.10.4'
-PACKAGE_STRING='NetworkManager 1.10.4'
+PACKAGE_VERSION='1.10.6'
+PACKAGE_STRING='NetworkManager 1.10.6'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1725,7 +1725,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.10.4 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.10.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1795,7 +1795,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.10.4:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.10.6:";;
    esac
   cat <<\_ACEOF
 
@@ -2142,7 +2142,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.10.4
+NetworkManager configure 1.10.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2915,7 +2915,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.10.4, which was
+It was created by NetworkManager $as_me 1.10.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3785,7 +3785,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.10.4'
+ VERSION='1.10.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17969,8 +17969,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=10
-NM_MICRO_VERSION=4
-NM_VERSION=1.10.4
+NM_MICRO_VERSION=6
+NM_VERSION=1.10.6
 
 
 
@@ -17978,7 +17978,7 @@ NM_VERSION=1.10.4
 
 
 
-NM_GIT_SHA=f781411ceb83b9e2f678d57bc7239ba8c03b5b8d
+NM_GIT_SHA=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712
 
 if test """" != "no-config-h" ; then
 
@@ -27261,6 +27261,57 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+
+
+	CFLAGS_SAVED="$CFLAGS"
+	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wcast-function-type"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wcast-function-type works as expected" >&5
+$as_echo_n "checking whether -Wcast-function-type works as expected... " >&6; }
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <glib-object.h>
+		typedef struct { GObject parent; } NMObject;
+		typedef struct { GObjectClass parent; } NMObjectClass;
+		static void nm_object_init (NMObject *object) { }
+		static void nm_object_class_init (NMObjectClass *object) { }
+		G_DEFINE_TYPE (NMObject, nm_object, G_TYPE_OBJECT)
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wcast-function-type"
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			CFLAGS="$CFLAGS_SAVED"
+			CFLAGS="$CFLAGS -Wno-cast-function-type"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
+$as_echo "not supported" >&6; }
+		CFLAGS="$CFLAGS_SAVED"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -27551,13 +27602,6 @@ $as_echo_n "checking CC support C11 _Generic()... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo(void); int foo() { int a = 0; int b = _Generic (a, int: 4); return b + a; }
-int
-main ()
-{
-foo();
-  ;
-  return 0;
-}
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   cc_support_generic=1
@@ -27578,13 +27622,6 @@ $as_echo_n "checking CC support gcc __auto_type... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo(void); int foo() { int a = 0; __auto_type b = a; return b + a; }
-int
-main ()
-{
-foo();
-  ;
-  return 0;
-}
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   cc_support_auto_type=1
@@ -29394,7 +29431,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.10.4, which was
+This file was extended by NetworkManager $as_me 1.10.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29460,7 +29497,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.10.4
+NetworkManager config.status 1.10.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"