New upstream version 1.36.2 upstream/1.36.2

1 files changed, 33 insertions, 23 deletions

diff --git a/configure b/configure
index 88afb23c..b41d9e55 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.36.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.36.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.36.0'
-PACKAGE_STRING='NetworkManager 1.36.0'
+PACKAGE_VERSION='1.36.2'
+PACKAGE_STRING='NetworkManager 1.36.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1747,7 +1747,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.36.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.36.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1819,7 +1819,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.36.0:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.36.2:";;
    esac
   cat <<\_ACEOF
 
@@ -2170,7 +2170,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.36.0
+NetworkManager configure 1.36.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2943,7 +2943,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.36.0, which was
+It was created by NetworkManager $as_me 1.36.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3813,7 +3813,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.36.0'
+ VERSION='1.36.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17997,8 +17997,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=36
-NM_MICRO_VERSION=0
-NM_VERSION=1.36.0
+NM_MICRO_VERSION=2
+NM_VERSION=1.36.2
 
 
 
@@ -18006,7 +18006,7 @@ NM_VERSION=1.36.0
 
 
 
-NM_GIT_SHA=ccb20e23e335b13f6b71354737d653ed3e88101b
+NM_GIT_SHA=ae06ec5207cec126ca767020238c32598b8bfc5d
 
 if test """" != "no-config-h" ; then
 
@@ -20967,16 +20967,6 @@ else
   config_plugins_default=""
 fi
 
-if test -z "$config_plugins_default" -o "$config_plugins_default" = no; then
-	config_plugins_default=''
-	test "$enable_ifcfg_rh" = "yes"           && config_plugins_default="$config_plugins_default,ifcfg-rh"
-	test "$enable_ifupdown" = "yes"           && config_plugins_default="$config_plugins_default,ifupdown"
-	config_plugins_default="${config_plugins_default#,}"
-fi
-
-test "$enable_ifcfg_rh" = "yes"           && distro_plugins="$distro_plugins,ifcfg-rh"
-test "$enable_ifupdown" = "yes"           && distro_plugins="$distro_plugins,ifupdown"
-distro_plugins="${distro_plugins#,}"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20989,6 +20979,26 @@ if test "$enable_ifcfg_rh" = "yes"; then
 fi
 
 
+if test "$enable_ifcfg_rh" = yes; then
+
+$as_echo "#define WITH_CONFIG_PLUGIN_IFCFG_RH 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_CONFIG_PLUGIN_IFCFG_RH 0" >>confdefs.h
+
+fi
+
+if test "$enable_ifupdown" = yes; then
+
+$as_echo "#define WITH_CONFIG_PLUGIN_IFUPDOWN 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_CONFIG_PLUGIN_IFUPDOWN 0" >>confdefs.h
+
+fi
+
 # Code coverage
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5
@@ -30502,7 +30512,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.36.0, which was
+This file was extended by NetworkManager $as_me 1.36.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30568,7 +30578,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.36.0
+NetworkManager config.status 1.36.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"