Imported Upstream version 1.2.4 upstream/1.2.4

1 files changed, 49 insertions, 13 deletions

diff --git a/configure b/configure
index 153d5c91..21340a82 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.2.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.2.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.2.2'
-PACKAGE_STRING='NetworkManager 1.2.2'
+PACKAGE_VERSION='1.2.4'
+PACKAGE_STRING='NetworkManager 1.2.4'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -698,6 +698,7 @@ SYSTEM_CA_PATH
 DNSSEC_TRIGGER_SCRIPT
 DNSMASQ_PATH
 IPTABLES_PATH
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER
 with_netconfig
 with_resolvconf
 DHCPCD_PATH
@@ -1060,6 +1061,7 @@ with_dhclient
 with_dhcpcd
 with_resolvconf
 with_netconfig
+with_config_dns_rc_manager_default
 with_iptables
 with_dnsmasq
 with_dnssec_trigger
@@ -1685,7 +1687,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.2.2 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1755,7 +1757,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.2.2:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1883,6 +1885,8 @@ Optional Packages:
   --with-resolvconf=yes|no|path
                           Enable resolvconf support
   --with-netconfig=yes|no Enable SUSE netconfig support
+  --with-config-dns-rc-manager-default=symlink|file|netconfig|resolvconf
+                          Configure default value for main.rc-manager setting
   --with-iptables=/path/to/iptables
                           path to iptables
   --with-dnsmasq=/path/to/dnsmasq
@@ -2062,7 +2066,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.2.2
+NetworkManager configure 1.2.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2793,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.2.2, which was
+It was created by NetworkManager $as_me 1.2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3659,7 +3663,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.2.2'
+ VERSION='1.2.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17540,9 +17544,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=2
-NM_MICRO_VERSION=2
-NM_VERSION=1.2.2
-NM_GIT_SHA=8f6d416768cf69932999b1fc2ab4231321761657
+NM_MICRO_VERSION=4
+NM_VERSION=1.2.4
+NM_GIT_SHA=54a84c6b3bd04123ee0831ae371d795ddd694cf9
 
 
 
@@ -24467,6 +24471,17 @@ if test "${with_netconfig+set}" = set; then :
   withval=$with_netconfig;
 fi
 
+
+# Check whether --with-config-dns-rc-manager-default was given.
+if test "${with_config_dns_rc_manager_default+set}" = set; then :
+  withval=$with_config_dns_rc_manager_default; config_dns_rc_manager_default=$withval
+fi
+
+if test "$config_dns_rc_manager_default" != symlink -a "$config_dns_rc_manager_default" != file -a "$config_dns_rc_manager_default" != netconfig -a "$config_dns_rc_manager_default" != resolvconf; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&5
+$as_echo "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&2;}
+	config_dns_rc_manager_default=
+fi
 # Use netconfig by default on SUSE
 if test -z "$with_netconfig"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5
@@ -24546,6 +24561,11 @@ done
 test -n "$with_resolvconf" || with_resolvconf="no"
 
 fi
+if test "$with_resolvconf" != "no"; then
+	if test -z "$config_dns_rc_manager_default"; then :
+  config_dns_rc_manager_default=resolvconf
+fi
+fi
 if test "$with_netconfig" = "yes"; then
 	for ac_prog in netconfig
 do
@@ -24595,6 +24615,14 @@ done
 test -n "$with_netconfig" || with_netconfig="no"
 
 fi
+if test "$with_netconfig" != "no"; then
+	if test -z "$config_dns_rc_manager_default"; then :
+  config_dns_rc_manager_default=netconfig
+fi
+fi
+if test -z "$config_dns_rc_manager_default"; then :
+  config_dns_rc_manager_default=symlink
+fi
 # Define resolvconf and netconfig paths
 if test "$with_resolvconf" != "no"; then
 
@@ -24611,6 +24639,13 @@ _ACEOF
 
 fi
 
+cat >>confdefs.h <<_ACEOF
+#define NM_CONFIG_DEFAULT_DNS_RC_MANAGER "$config_dns_rc_manager_default"
+_ACEOF
+
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER=$config_dns_rc_manager_default
+
+
 # iptables path
 
 # Check whether --with-iptables was given.
@@ -27298,7 +27333,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.2.2, which was
+This file was extended by NetworkManager $as_me 1.2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27364,7 +27399,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.2.2
+NetworkManager config.status 1.2.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -29743,6 +29778,7 @@ echo
 echo "Handlers for /etc/resolv.conf:"
 echo "  resolvconf: ${with_resolvconf}"
 echo "  netconfig: ${with_netconfig}"
+echo "  config-dns-rc-manager-default: ${config_dns_rc_manager_default}"
 echo
 
 echo "DHCP clients:"