New upstream version 1.18.0 upstream/1.18.0

1 files changed, 16 insertions, 18 deletions

diff --git a/configure b/configure
index b3e14a3b..5948703c 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.16.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.18.0.
 #
 # 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.16.0'
-PACKAGE_STRING='NetworkManager 1.16.0'
+PACKAGE_VERSION='1.18.0'
+PACKAGE_STRING='NetworkManager 1.18.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1731,7 +1731,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.16.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.18.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1801,7 +1801,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.16.0:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.18.0:";;
    esac
   cat <<\_ACEOF
 
@@ -2141,7 +2141,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.16.0
+NetworkManager configure 1.18.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2914,7 +2914,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.16.0, which was
+It was created by NetworkManager $as_me 1.18.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3784,7 +3784,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.16.0'
+ VERSION='1.18.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17967,9 +17967,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=16
+NM_MINOR_VERSION=18
 NM_MICRO_VERSION=0
-NM_VERSION=1.16.0
+NM_VERSION=1.18.0
 
 
 
@@ -17977,7 +17977,7 @@ NM_VERSION=1.16.0
 
 
 
-NM_GIT_SHA=15a6b41239e9abc44f128d2721f63c2ce09a40ec
+NM_GIT_SHA=cb739531832730e0585a740cd389c715d072cd72
 
 if test """" != "no-config-h" ; then
 
@@ -21154,12 +21154,9 @@ $as_echo "$ac_cv_search_dlopen" >&6; }
 ac_res=$ac_cv_search_dlopen
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  ac_cv_search_dlopen=
+  test "$ac_cv_search_dlopen" = "none required" || DL_LIBS="$ac_cv_search_dlopen"
 fi
 
-DL_LIBS="$ac_cv_search_dlopen"
 
 
 
@@ -23683,7 +23680,8 @@ else
   with_ebpf=auto
 fi
 
-if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then
+# 'auto' means 'false' because there are still some issues.
+if test "$with_ebpf" = "yes" ; then
 	ac_fn_c_check_header_mongrel "$LINENO" "linux/bpf.h" "ac_cv_header_linux_bpf_h" "$ac_includes_default"
 if test "x$ac_cv_header_linux_bpf_h" = xyes; then :
   have_ebpf=yes
@@ -28939,7 +28937,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.16.0, which was
+This file was extended by NetworkManager $as_me 1.18.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29005,7 +29003,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.16.0
+NetworkManager config.status 1.18.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"