New upstream version 1.5.91 upstream/1.5.91

1 files changed, 39 insertions, 19 deletions

diff --git a/configure b/configure
index a93d16eb..4a867060 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.5.90.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.5.91.
 #
 # 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.5.90'
-PACKAGE_STRING='NetworkManager 1.5.90'
+PACKAGE_VERSION='1.5.91'
+PACKAGE_STRING='NetworkManager 1.5.91'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1709,7 +1709,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.5.90 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.5.91 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1779,7 +1779,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.5.90:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.5.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1829,9 +1829,10 @@ 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).
-                          Deprecated option. Use --with-more-asserts=level
-  --enable-more-logging   Enable more debug logging (default: no)
+  --enable-more-asserts   Enable more assertions for debugging (default:
+                          auto). Deprecated option. Use
+                          --with-more-asserts=level
+  --enable-more-logging   Enable more debug logging (default: auto)
   --enable-lto            Enable Link Time Optimization for smaller size
                           (default: no)
   --enable-ld-gc          Enable garbage collection of unused symbols on
@@ -1940,7 +1941,8 @@ Optional Packages:
   --with-nmcli=yes|no     Build nmcli
   --with-nmtui=yes|no     Build nmtui
   --with-more-asserts=level
-                          Enable more assertions for debugging (default: 0)
+                          Enable more assertions for debugging (0 = none, 100
+                          = all, default: auto)
   --with-valgrind=yes|no|path
                           Use valgrind to memory-check the tests (default: no)
   --with-tests            Build NetworkManager tests (deprecated)
@@ -2113,7 +2115,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.5.90
+NetworkManager configure 1.5.91
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2840,7 +2842,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.5.90, which was
+It was created by NetworkManager $as_me 1.5.91, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3710,7 +3712,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.5.90'
+ VERSION='1.5.91'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17793,8 +17795,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=5
-NM_MICRO_VERSION=90
-NM_VERSION=1.5.90
+NM_MICRO_VERSION=91
+NM_VERSION=1.5.91
 
 
 
@@ -17802,7 +17804,7 @@ NM_VERSION=1.5.90
 
 
 
-NM_GIT_SHA=ba414491b7c4307a06267d4898ff0fd8b80f7df8
+NM_GIT_SHA=701f79280f94c386111ef54bdd97d14f038e8ba7
 
 if test """" != "no-config-h" ; then
 
@@ -25870,12 +25872,23 @@ else
 fi
 
 
+if test $(( ${NM_MINOR_VERSION} % 2 )) = "1"; then
+    # A development version
+    more_warnings_default=error
+    more_asserts_default=100
+    more_logging_default=yes
+else
+    # A release version
+    more_warnings_default=yes
+    more_asserts_default=0
+    more_logging_default=no
+fi
 
 # Check whether --enable-more-warnings was given.
 if test "${enable_more_warnings+set}" = set; then :
   enableval=$enable_more_warnings; set_more_warnings="$enableval"
 else
-  set_more_warnings=yes
+  set_more_warnings=${more_warnings_default}
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5
@@ -26285,7 +26298,6 @@ if test "${enable_more_asserts+set}" = set; then :
   enableval=$enable_more_asserts;
 fi
 
-more_asserts=0
 if test "${enable_more_asserts}" = "yes"; then
     more_asserts=100
 fi
@@ -26302,6 +26314,9 @@ else
         more_asserts=100
     fi
 fi
+if test "${more_asserts}" = ""; then
+    more_asserts=${more_asserts_default}
+fi
 
 cat >>confdefs.h <<_ACEOF
 #define NM_MORE_ASSERTS $more_asserts
@@ -26313,6 +26328,9 @@ if test "${enable_more_logging+set}" = set; then :
   enableval=$enable_more_logging;
 fi
 
+if test "${enable_more_logging}" = ""; then
+    enable_more_logging=${more_logging_default}
+fi
 if test "${enable_more_logging}" = "yes"; then
 
 $as_echo "#define NM_MORE_LOGGING 1" >>confdefs.h
@@ -28277,7 +28295,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.5.90, which was
+This file was extended by NetworkManager $as_me 1.5.91, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28343,7 +28361,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.5.90
+NetworkManager config.status 1.5.91
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -30526,6 +30544,8 @@ echo "  documentation-settings: $build_setting_docs"
 echo "  introspection: $have_introspection"
 echo "  tests: $enable_tests"
 echo "  more-asserts: $more_asserts"
+echo "  more-logging: $enable_more_logging"
+echo "  more-warnings: $set_more_warnings"
 echo "  valgrind: $with_valgrind   $with_valgrind_suppressions"
 echo "  code coverage: $enable_code_coverage"
 echo "  LTO: $enable_lto"