New upstream version 1.34.0 upstream/1.34.0

1 files changed, 126 insertions, 60 deletions

diff --git a/configure b/configure
index 307c8e4e..ec0ded7e 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.32.12.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.34.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.32.12'
-PACKAGE_STRING='NetworkManager 1.32.12'
+PACKAGE_VERSION='1.34.0'
+PACKAGE_STRING='NetworkManager 1.34.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1107,6 +1107,7 @@ with_system_ca_path
 with_kernel_firmware_dir
 with_libpsl
 enable_concheck
+with_readline
 with_nmcli
 with_nm_cloud_setup
 with_nmtui
@@ -1744,7 +1745,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.32.12 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.34.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1816,7 +1817,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.32.12:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.34.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1975,6 +1976,8 @@ Optional Packages:
                           where kernel firmware directory is
                           [default=/lib/firmware]
   --with-libpsl=yes|no    Link against libpsl
+  --with-readline=auto|libreadline|libedit|none
+                          Using libreadline (auto) or libedit
   --with-nmcli=yes|no     Build nmcli
   --with-nm-cloud-setup=yes|no
                           Build nm-cloud-setup, a tool for automatically
@@ -2163,7 +2166,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.32.12
+NetworkManager configure 1.34.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2936,7 +2939,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.32.12, which was
+It was created by NetworkManager $as_me 1.34.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3806,7 +3809,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.32.12'
+ VERSION='1.34.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17989,9 +17992,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=32
-NM_MICRO_VERSION=12
-NM_VERSION=1.32.12
+NM_MINOR_VERSION=34
+NM_MICRO_VERSION=0
+NM_VERSION=1.34.0
 
 
 
@@ -17999,7 +18002,7 @@ NM_VERSION=1.32.12
 
 
 
-NM_GIT_SHA=d90c03b1b8f3e6f5ff8fbc1cbc176f0a0dec6362
+NM_GIT_SHA=9133a30c9deb3a003a20b09a617a25b07ada18ae
 
 if test """" != "no-config-h" ; then
 
@@ -20896,7 +20899,6 @@ nmstatedir='${localstatedir}'/lib/$PACKAGE
 nmrundir='${runstatedir}'/$PACKAGE
 
 
-
 for ac_func in __secure_getenv secure_getenv
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -25160,6 +25162,15 @@ else
   WITH_OPENVSWITCH_FALSE=
 fi
 
+if test "${enable_ovs}" = "yes" ; then
+
+$as_echo "#define WITH_OPENVSWITCH 1" >>confdefs.h
+
+else
+
+$as_echo "#define WITH_OPENVSWITCH 0" >>confdefs.h
+
+fi
 
 # DHCP client support
 
@@ -26069,29 +26080,46 @@ $as_echo "yes" >&6; }
 fi
 
 
-# Check whether --with-nmcli was given.
-if test "${with_nmcli+set}" = set; then :
-  withval=$with_nmcli;
+
+
+# Check whether --with-readline was given.
+if test "${with_readline+set}" = set; then :
+  withval=$with_readline;
+else
+  with_readline=auto
 fi
 
-if test "$with_nmcli" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
+  if test "$with_readline" != "none"; then
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
 $as_echo_n "checking for a readline compatible library... " >&6; }
 if ${ax_cv_lib_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-    ORIG_LIBS="$LIBS"
-    for readline_lib in readline edit editline; do
-      for termcap_lib in "" termcap curses ncurses; do
-        if test -z "$termcap_lib"; then
-          TRY_LIB="-l$readline_lib"
-        else
-          TRY_LIB="-l$readline_lib -l$termcap_lib"
-        fi
-        LIBS="$ORIG_LIBS $TRY_LIB"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      ORIG_LIBS="$LIBS"
+
+      if test "$with_readline" = "libreadline"; then
+        search_readlines="readline"
+      elif test "$with_readline" = "libedit"; then
+        search_readlines="edit"
+      elif test "$with_readline" = "auto"; then
+        search_readlines="readline edit"
+      else
+        as_fn_error $? "invalid --with-readline option. Valid options are --with-readline=auto|libreadline|libedit|none" "$LINENO" 5
+      fi
+
+      for readline_lib in $search_readlines; do
+        # prefer ncurses since we use it for nmtui too
+        for termcap_lib in "" termcap curses ncurses; do
+          if test -z "$termcap_lib"; then
+            TRY_LIB="-l$readline_lib"
+          else
+            TRY_LIB="-l$readline_lib -l$termcap_lib"
+          fi
+          LIBS="$ORIG_LIBS $TRY_LIB"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -26114,50 +26142,62 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+          if test -n "$ax_cv_lib_readline"; then
+            break
+          fi
+        done
         if test -n "$ax_cv_lib_readline"; then
+          if test "$with_readline" = auto; then
+            if test "$readline_lib" = readline; then
+              with_readline=libreadline
+            else
+              with_readline=libedit
+            fi
+          fi
           break
         fi
       done
-      if test -n "$ax_cv_lib_readline"; then
-        break
+      if test -z "$ax_cv_lib_readline"; then
+        if test "$with_readline" != auto; then
+          as_fn_error $? "libreadline not found for --with-readline=$with_readline\"" "$LINENO" 5
+        fi
+        with_readline=none
+        ax_cv_lib_readline="no"
       fi
-    done
-    if test -z "$ax_cv_lib_readline"; then
-      ax_cv_lib_readline="no"
-    fi
-    LIBS="$ORIG_LIBS"
+      LIBS="$ORIG_LIBS"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5
 $as_echo "$ax_cv_lib_readline" >&6; }
 
-  if test "$ax_cv_lib_readline" != "no"; then
-    READLINE_LIBS="$ax_cv_lib_readline"
+    if test "$ax_cv_lib_readline" != "no"; then
+      READLINE_LIBS="$ax_cv_lib_readline"
 
 
 $as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
-    for ac_header in readline.h readline/readline.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
+      if test "$with_readline" = "libedit"; then
 
-done
+$as_echo "#define HAVE_EDITLINE_READLINE 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5
+      else
+
+$as_echo "#define HAVE_EDITLINE_READLINE 0" >>confdefs.h
+
+
+      fi
+
+      ORIG_LIBS="$LIBS"
+      LIBS="$ORIG_LIBS $ax_cv_lib_readline"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5
 $as_echo_n "checking whether readline supports history... " >&6; }
 if ${ax_cv_lib_readline_history+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-      ax_cv_lib_readline_history="no"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        ax_cv_lib_readline_history="no"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -26166,11 +26206,11 @@ else
 #ifdef __cplusplus
 extern "C"
 #endif
-char add_history ();
+char history_set_history_state ();
 int
 main ()
 {
-return add_history ();
+return history_set_history_state ();
   ;
   return 0;
 }
@@ -26184,11 +26224,13 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_history" >&5
 $as_echo "$ax_cv_lib_readline_history" >&6; }
-    if test "$ax_cv_lib_readline_history" = "yes"; then
+      LIBS=$ORIG_LIBS
+
+      if test "$ax_cv_lib_readline_history" = "yes"; then
 
 $as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h
 
-      for ac_header in history.h readline/history.h
+        for ac_header in readline/history.h histedit.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -26201,12 +26243,36 @@ fi
 
 done
 
+      else
+
+$as_echo "#define HAVE_READLINE_HISTORY 0" >>confdefs.h
+
+      fi
     fi
+
   fi
 
-	build_nmcli=yes
+
+
+# Check whether --with-nmcli was given.
+if test "${with_nmcli+set}" = set; then :
+  withval=$with_nmcli;
+else
+  with_nmcli=yes
+fi
+
+if test "$with_nmcli" == yes; then
+    if test "$with_readline" = none; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "nmcli requires readline library. Use --with-readline or --with-nmcli=no
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+    build_nmcli=yes
+elif test "$with_nmcli" == no; then
+    build_nmcli=no
 else
-	build_nmcli=no
+    as_fn_error $? "invalid --with-nmcli option. Valid options are --with-nmcli=yes|no" "$LINENO" 5
 fi
  if test "$build_nmcli" = yes; then
   BUILD_NMCLI_TRUE=
@@ -29698,7 +29764,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc src/libnm-client-impl/libnm.pc src/libnm-core-public/nm-version-macros.h"
+ac_config_files="$ac_config_files Makefile po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml src/libnm-client-impl/libnm.pc src/libnm-core-public/nm-version-macros.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -30406,7 +30472,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.32.12, which was
+This file was extended by NetworkManager $as_me 1.34.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30472,7 +30538,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.32.12
+NetworkManager config.status 1.34.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31001,7 +31067,6 @@ do
     "docs/api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/api/version.xml" ;;
     "docs/libnm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm/Makefile" ;;
     "docs/libnm/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm/version.xml" ;;
-    "NetworkManager.pc") CONFIG_FILES="$CONFIG_FILES NetworkManager.pc" ;;
     "src/libnm-client-impl/libnm.pc") CONFIG_FILES="$CONFIG_FILES src/libnm-client-impl/libnm.pc" ;;
     "src/libnm-core-public/nm-version-macros.h") CONFIG_FILES="$CONFIG_FILES src/libnm-core-public/nm-version-macros.h" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -32665,4 +32730,5 @@ echo "  crypto: $with_crypto (have-gnutls: $have_crypto_gnutls, have-nss: $have_
 echo "  sanitizers: $sanitizers"
 echo "  Mozilla Public Suffix List: $with_libpsl"
 echo "  eBPF: $have_ebpf"
+echo "  readline: $with_readline"
 echo