diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 824 |
1 files changed, 491 insertions, 333 deletions
diff --git a/configure b/configure index 38af30c4..6aac5e54 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.8.4. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.9.90. # # 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.8.4' -PACKAGE_STRING='NetworkManager 1.8.4' +PACKAGE_VERSION='1.9.90' +PACKAGE_STRING='NetworkManager 1.9.90' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -671,7 +671,6 @@ PYTHON_EXEC_PREFIX PYTHON_PREFIX PYTHON_VERSION PYTHON -BINUTILS_NM NM_LOG_COMPILER REQUIRE_ROOT_TESTS_FALSE REQUIRE_ROOT_TESTS_TRUE @@ -715,6 +714,10 @@ DHCPCD_PATH with_dhcpcd DHCLIENT_PATH with_dhclient +WITH_OPENVSWITCH_FALSE +WITH_OPENVSWITCH_TRUE +DHCPCANON_PATH +with_dhcpcanon WITH_OFONO_FALSE WITH_OFONO_TRUE WITH_BLUEZ5_DUN_FALSE @@ -904,7 +907,6 @@ DSYMUTIL MANIFEST_TOOL DLLTOOL OBJDUMP -NM ac_ct_DUMPBIN DUMPBIN LD @@ -919,6 +921,8 @@ build_vendor build_cpu build LIBTOOL +ac_ct_NM +NM ac_ct_RANLIB RANLIB ac_ct_AR @@ -1073,6 +1077,8 @@ with_pppd with_modem_manager_1 enable_bluez5_dun with_ofono +with_dhcpcanon +enable_ovs with_dhclient with_dhcpcd with_dhcpcd_supports_ipv6 @@ -1717,7 +1723,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.8.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.9.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1787,7 +1793,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.8.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.9.90:";; esac cat <<\_ACEOF @@ -1835,6 +1841,7 @@ Optional Features: --enable-modify-system Allow users to modify system connections --enable-ppp enable PPP/PPPoE support --enable-bluez5-dun enable Bluez5 DUN support + --enable-ovs enable OpenVSwitch support --enable-concheck enable connectivity checking support --enable-more-warnings Possible values: no/yes/error --enable-more-asserts Enable more assertions for debugging (default: @@ -1919,6 +1926,8 @@ Optional Packages: path to pppd binary --with-modem-manager-1 Enable new ModemManager1 interface support --with-ofono Enable oFono support (experimental) + --with-dhcpcanon=yes|no|path + Enable dhcpcanon support (experimental) --with-dhclient=yes|no|path Enable dhclient 4.x support --with-dhcpcd=yes|no|path @@ -2131,7 +2140,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.8.4 +NetworkManager configure 1.9.90 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2904,7 +2913,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.8.4, which was +It was created by NetworkManager $as_me 1.9.90, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3774,7 +3783,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.8.4' + VERSION='1.9.90' cat >>confdefs.h <<_ACEOF @@ -6873,6 +6882,106 @@ esac fi fi +if test -n "$ac_tool_prefix"; then + for ac_prog in $BINUTILS_NM gcc-nm nm + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + ac_cv_prog_NM="$NM" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NM="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NM=$ac_cv_prog_NM +if test -n "$NM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 +$as_echo "$NM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$NM" && break + done +fi +if test -z "$NM"; then + ac_ct_NM=$NM + for ac_prog in $BINUTILS_NM gcc-nm nm +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NM"; then + ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NM="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_NM=$ac_cv_prog_ac_ct_NM +if test -n "$ac_ct_NM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 +$as_echo "$ac_ct_NM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_NM" && break +done + + if test "x$ac_ct_NM" = x; then + NM="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NM=$ac_ct_NM + fi +fi + case `pwd` in @@ -17857,9 +17966,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=8 -NM_MICRO_VERSION=4 -NM_VERSION=1.8.4 +NM_MINOR_VERSION=9 +NM_MICRO_VERSION=90 +NM_VERSION=1.9.90 @@ -17867,7 +17976,7 @@ NM_VERSION=1.8.4 -NM_GIT_SHA=51fdc50ab179a0582012d1b50e587761765ad15e +NM_GIT_SHA=de6b348bfcb34706213c2182f5fe9a4920f7fdd4 if test """" != "no-config-h" ; then @@ -17971,6 +18080,71 @@ cat >>confdefs.h <<_ACEOF _ACEOF +for ac_header in sys/auxv.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_auxv_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_AUXV_H 1 +_ACEOF + +fi + +done + + +ac_fn_c_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include <sys/random.h> + +" +if test "x$ac_cv_have_decl_getrandom" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETRANDOM $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + +$as_echo "#define USE_SYS_RANDOM_H 1" >>confdefs.h + + +$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h + + +else + ac_fn_c_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include <linux/random.h> + +" +if test "x$ac_cv_have_decl_getrandom" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETRANDOM $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + +$as_echo "#define USE_SYS_RANDOM_H 0" >>confdefs.h + + +$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h + +else + +$as_echo "#define USE_SYS_RANDOM_H 0" >>confdefs.h + + +$as_echo "#define HAVE_GETRANDOM 0" >>confdefs.h + +fi + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -20891,12 +21065,12 @@ else 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" - test "$enable_ifnet" = "yes" && config_plugins_default="$config_plugins_default,ifnet" - test "$enable_config_plugin_ibft" = "yes" && config_plugins_default="$config_plugins_default,ibft" - config_plugins_default="${config_plugins_default#,}" + 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" + test "$enable_ifnet" = "yes" && config_plugins_default="$config_plugins_default,ifnet" + test "$enable_config_plugin_ibft" = "yes" && config_plugins_default="$config_plugins_default,ibft" + config_plugins_default="${config_plugins_default#,}" fi test "$enable_ifcfg_rh" = "yes" && distro_plugins="$distro_plugins,ifcfg-rh" @@ -20921,7 +21095,7 @@ $as_echo "#define WITH_SETTINGS_PLUGIN_IBFT 0" >>confdefs.h fi if test "$enable_ifcfg_rh" = "yes"; then - DISTRO_NETWORK_SERVICE=network.service + DISTRO_NETWORK_SERVICE=network.service fi @@ -20957,9 +21131,6 @@ $as_echo "$enable_code_coverage" >&6; } fi - # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9 1.10" - # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -21035,40 +21206,11 @@ fi - if test "$LCOV" ; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 -$as_echo_n "checking for lcov version... " >&6; } -if ${gnome_cv_lcov_version+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test -z "$LCOV" ; then : - gnome_cv_lcov_version=invalid - lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` - for lcov_check_version in $lcov_version_list; do - if test "$lcov_version" = "$lcov_check_version"; then - gnome_cv_lcov_version="$lcov_check_version (ok)" - fi - done + as_fn_error $? "lcov is needed to enable code coverage reporting" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnome_cv_lcov_version" >&5 -$as_echo "$gnome_cv_lcov_version" >&6; } - -else - - lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" - as_fn_error $? "$lcov_msg" "$LINENO" 5 - -fi - - case $gnome_cv_lcov_version in - ""|invalid) - lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." - as_fn_error $? "$lcov_msg" "$LINENO" 5 - LCOV="exit 0;" - ;; - esac if test -z "$GENHTML" ; then : @@ -21223,18 +21365,18 @@ $as_echo_n "checking Linux kernel WEXT headers... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __user - #define __user - #endif - #include <sys/types.h> - #include <linux/types.h> - #include <sys/socket.h> - #include <linux/wireless.h> + #define __user + #endif + #include <sys/types.h> + #include <linux/types.h> + #include <sys/socket.h> + #include <linux/wireless.h> int main () { #ifndef IWEVGENIE - #error "not found" - #endif + #error "not found" + #endif ; return 0; } @@ -21248,7 +21390,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_iwevgenie" >&5 $as_echo "$ac_have_iwevgenie" >&6; } if test "$ac_have_iwevgenie" = no; then - as_fn_error $? "Linux kernel development header linux/wireless.h not installed or not functional" "$LINENO" 5 + as_fn_error $? "Linux kernel development header linux/wireless.h not installed or not functional" "$LINENO" 5 fi $as_echo "#define HAVE_WEXT 1" >>confdefs.h @@ -21272,12 +21414,12 @@ $as_echo_n "checking Linux kernel nl80211 headers... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __user - #define __user - #endif - #include <sys/types.h> - #include <linux/types.h> - #include <sys/socket.h> - #include <linux/nl80211.h> + #define __user + #endif + #include <sys/types.h> + #include <linux/types.h> + #include <sys/socket.h> + #include <linux/nl80211.h> int main () { @@ -21304,12 +21446,12 @@ $as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6; cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __user - #define __user - #endif - #include <sys/types.h> - #include <linux/types.h> - #include <sys/socket.h> - #include <linux/nl80211.h> + #define __user + #endif + #include <sys/types.h> + #include <linux/types.h> + #include <sys/socket.h> + #include <linux/nl80211.h> int main () { @@ -21344,11 +21486,11 @@ $as_echo_n "checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __user - #define __user - #endif - #include <sys/types.h> - #include <linux/types.h> - #include <linux/if_vlan.h> + #define __user + #endif + #include <sys/types.h> + #include <linux/types.h> + #include <linux/if_vlan.h> int main () { @@ -21706,7 +21848,7 @@ else $as_echo "yes" >&6; } fi - LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' + LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -21802,7 +21944,7 @@ else $as_echo "yes" >&6; } fi - LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' + LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS @@ -21811,7 +21953,7 @@ else $as_echo "yes" >&6; } LOG_DRIVER='$(top_srcdir)/build-aux/tap-driver.sh' - AM_TESTS_FD_REDIRECT='--tap' + AM_TESTS_FD_REDIRECT='--tap' fi @@ -21892,6 +22034,7 @@ as_fn_error $? "$DBUS_PKG_ERRORS Configure with --without-libnm-glib if you do not need the legacy libraries See \`config.log' for more details" "$LINENO" 5; } + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -21901,6 +22044,7 @@ as_fn_error $? "$DBUS_PKG_ERRORS Configure with --without-libnm-glib if you do not need the legacy libraries See \`config.log' for more details" "$LINENO" 5; } + else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -21908,7 +22052,8 @@ else $as_echo "yes" >&6; } : fi - with_libnm_glib=yes + + with_libnm_glib=yes fi if test "$with_libnm_glib" != "no"; then WITH_LEGACY_LIBRARIES_TRUE= @@ -23047,20 +23192,20 @@ $as_echo "yes" >&6; } have_systemd_logind=yes fi else - have_systemd_logind=no + have_systemd_logind=no fi if test "$use_systemd_logind" = "yes" -a "$have_systemd_logind" = "no"; then - as_fn_error $? "You must have libsystemd installed to build with systemd-logind support." "$LINENO" 5 + as_fn_error $? "You must have libsystemd installed to build with systemd-logind support." "$LINENO" 5 fi if test "$have_systemd_logind" = "yes"; then $as_echo "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h - session_tracking="$session_tracking, systemd-logind" + session_tracking="$session_tracking, systemd-logind" fi if test "$use_elogind" = "yes" -a "$have_systemd_logind" = "yes"; then - as_fn_error $? "Cannot enable systemd-logind together with elogind." "$LINENO" 5 + as_fn_error $? "Cannot enable systemd-logind together with elogind." "$LINENO" 5 fi if test "$use_elogind" = "yes"; then @@ -23275,16 +23420,16 @@ $as_echo "yes" >&6; } have_elogind=yes fi else - have_elogind=no + have_elogind=no fi if test "$use_elogind" = "yes" -a "$have_elogind" = "no"; then - as_fn_error $? "You must have libelogind installed to build with elogind support." "$LINENO" 5 + as_fn_error $? "You must have libelogind installed to build with elogind support." "$LINENO" 5 fi if test "$have_elogind" = "yes"; then $as_echo "#define SESSION_TRACKING_ELOGIND 1" >>confdefs.h - session_tracking="$session_tracking, elogind" + session_tracking="$session_tracking, elogind" fi if test "$use_consolekit" = "yes"; then @@ -23305,7 +23450,7 @@ if test "${with_suspend_resume+set}" = set; then : fi if test "z$with_suspend_resume" = "z"; then - if test -n "$PKG_CONFIG" && \ + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? @@ -23324,11 +23469,11 @@ else have_systemd_inhibit=no fi fi - if test "z${have_systemd_inhibit}" = "zyes"; then - # Use systemd if it's new enough - with_suspend_resume="systemd" - else - if test -n "$PKG_CONFIG" && \ + if test "z${have_systemd_inhibit}" = "zyes"; then + # Use systemd if it's new enough + with_suspend_resume="systemd" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? @@ -23347,28 +23492,28 @@ else have_elogind_inhibit=no fi fi - if test "z${have_elogind_inhibit}" = "zyes"; then - # Use elogind if it's new enough - with_suspend_resume="elogind" - else - if test "$use_consolekit" = "yes"; then - # Use consolekit suspend if session tracking is consolekit - with_suspend_resume="consolekit" - else - # Fall back to upower - with_suspend_resume="upower" - fi - fi -fi + if test "z${have_elogind_inhibit}" = "zyes"; then + # Use elogind if it's new enough + with_suspend_resume="elogind" + else + if test "$use_consolekit" = "yes"; then + # Use consolekit suspend if session tracking is consolekit + with_suspend_resume="consolekit" + else + # Fall back to upower + with_suspend_resume="upower" + fi + fi + fi fi case $with_suspend_resume in - upower) + upower) $as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h - ;; - systemd) + ;; + systemd) pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 @@ -23623,8 +23768,8 @@ fi $as_echo "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h - ;; - elogind) + ;; + elogind) pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 @@ -23879,15 +24024,15 @@ fi $as_echo "#define SUSPEND_RESUME_ELOGIND 1" >>confdefs.h - ;; - consolekit) + ;; + consolekit) $as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h - ;; - *) - as_fn_error $? "--with-suspend-resume must be one of upower, systemd, elogind, consolekit" "$LINENO" 5 - ;; + ;; + *) + as_fn_error $? "--with-suspend-resume must be one of upower, systemd, elogind, consolekit" "$LINENO" 5 + ;; esac # SELinux support @@ -23972,10 +24117,10 @@ $as_echo "yes" >&6; } have_selinux=yes fi else - have_selinux=no + have_selinux=no fi if test "$with_selinux" = "yes" -a "$have_selinux" = "no"; then - as_fn_error $? "You must have libselinux installed to build --with-selinux=yes." "$LINENO" 5 + as_fn_error $? "You must have libselinux installed to build --with-selinux=yes." "$LINENO" 5 fi if test "$have_selinux" = "yes"; then @@ -24068,27 +24213,27 @@ else $as_echo "yes" >&6; } have_libaudit=yes fi - if test "$with_libaudit" != "auto" -a "$have_libaudit" = "no"; then - as_fn_error $? "You must have libaudit installed to build --with-libaudit=$with_libaudit." "$LINENO" 5 - fi + if test "$with_libaudit" != "auto" -a "$have_libaudit" = "no"; then + as_fn_error $? "You must have libaudit installed to build --with-libaudit=$with_libaudit." "$LINENO" 5 + fi else - have_libaudit=no + have_libaudit=no fi if test "$have_libaudit" = "yes"; then $as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h - if test "$with_libaudit" = "yes-disabled-by-default"; then + if test "$with_libaudit" = "yes-disabled-by-default"; then $as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h - NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' - else + NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' + else $as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"true\"" >>confdefs.h - NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='true' - fi + NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='true' + fi else $as_echo "#define HAVE_LIBAUDIT 0" >>confdefs.h @@ -24096,7 +24241,7 @@ $as_echo "#define HAVE_LIBAUDIT 0" >>confdefs.h $as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h - NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' + NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' fi @@ -24482,9 +24627,9 @@ if (test "${enable_json_validation}" == "no"); then $as_echo "#define WITH_JANSSON 0" >>confdefs.h else - if test "$have_jansson" = "no"; then - as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 - fi + if test "$have_jansson" = "no"; then + as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 + fi $as_echo "#define WITH_JANSSON 1" >>confdefs.h @@ -24749,16 +24894,16 @@ $as_echo "yes" >&6; } fi - # Work around a pkg-config bug (fdo #29801) where exists != usable - FOO=`$PKG_CONFIG --cflags --libs nss` - if test x"$?" != "x0"; then - as_fn_error $? "No usable NSS found" "$LINENO" 5 - fi + # Work around a pkg-config bug (fdo #29801) where exists != usable + FOO=`$PKG_CONFIG --cflags --libs nss` + if test x"$?" != "x0"; then + as_fn_error $? "No usable NSS found" "$LINENO" 5 + fi $as_echo "#define HAVE_NSS 1" >>confdefs.h - with_nss=yes + with_nss=yes elif test x"$ac_crypto" = xgnutls; then pkg_failed=no @@ -24854,9 +24999,9 @@ fi $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h - with_gnutls=yes + with_gnutls=yes else - as_fn_error $? "Please choose either 'nss' or 'gnutls' for certificate and crypto operations" "$LINENO" 5 + as_fn_error $? "Please choose either 'nss' or 'gnutls' for certificate and crypto operations" "$LINENO" 5 fi if test x"$with_nss" != xno; then WITH_NSS_TRUE= @@ -24877,7 +25022,7 @@ fi # Shouldn't ever trigger this, but just in case... if test x"$ac_nss" = xno -a x"$ac_gnutls" = xno; then - as_fn_error $? "Could not find required development headers and libraries for '$ac_crypto'" "$LINENO" 5 + as_fn_error $? "Could not find required development headers and libraries for '$ac_crypto'" "$LINENO" 5 fi GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' @@ -24895,9 +25040,9 @@ fi if test -n "$with_dbus_sys_dir" ; then - DBUS_SYS_DIR="$with_dbus_sys_dir" + DBUS_SYS_DIR="$with_dbus_sys_dir" else - DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d" + DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d" fi @@ -24963,7 +25108,7 @@ if test "${with_pppd+set}" = set; then : fi if test "x${with_pppd}" = x; then - # Extract the first word of "pppd", so it can be a program name with args. + # Extract the first word of "pppd", so it can be a program name with args. set dummy pppd; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -25005,7 +25150,7 @@ fi else - PPPD_PATH="$with_pppd" + PPPD_PATH="$with_pppd" fi cat >>confdefs.h <<_ACEOF @@ -25096,15 +25241,15 @@ $as_echo "yes" >&6; } have_libmm_glib=yes fi - if (test "${have_libmm_glib}" = "no"); then - if (test "${with_modem_manager_1}" = "yes"); then - as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5 - else - with_modem_manager_1="no" - fi - else - with_modem_manager_1="yes" - fi + if (test "${have_libmm_glib}" = "no"); then + if (test "${with_modem_manager_1}" = "yes"); then + as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5 + else + with_modem_manager_1="no" + fi + else + with_modem_manager_1="yes" + fi fi if (test "${with_modem_manager_1}" = "yes"); then @@ -25252,6 +25397,110 @@ else fi +# DHCP client support with dhcpcanon + +# Check whether --with-dhcpcanon was given. +if test "${with_dhcpcanon+set}" = set; then : + withval=$with_dhcpcanon; +fi + +if test "$with_dhcpcanon" != "no"; then + with_dhcpcanon_="$with_dhcpcanon" + for ac_prog in dhcpcanon +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_with_dhcpcanon+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_dhcpcanon in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_dhcpcanon="$with_dhcpcanon" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/sbin:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_with_dhcpcanon="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +with_dhcpcanon=$ac_cv_path_with_dhcpcanon +if test -n "$with_dhcpcanon"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcanon" >&5 +$as_echo "$with_dhcpcanon" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$with_dhcpcanon" && break +done +test -n "$with_dhcpcanon" || with_dhcpcanon="no" + + if test "$with_dhcpcanon" == "no"; then + if test "$with_dhcpcanon_" == yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&5 +$as_echo "$as_me: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&2;} + with_dhcpcanon=/sbin/dhcpcanon + fi + fi +fi +if test "$with_dhcpcanon" != "no"; then + +$as_echo "#define WITH_DHCPCANON 1" >>confdefs.h + + DHCPCANON_PATH=$with_dhcpcanon + +else + +$as_echo "#define WITH_DHCPCANON 0" >>confdefs.h + +fi + +# OpenVSwitch integration +# Check whether --enable-ovs was given. +if test "${enable_ovs+set}" = set; then : + enableval=$enable_ovs; +fi + +if test "${enable_ovs}" != "no"; then + enable_ovs='yes' + if test "$have_jansson" = "no"; then + as_fn_error $? "Jansson is required for ovs support" "$LINENO" 5 + fi + +$as_echo "#define WITH_OPENVSWITCH 1" >>confdefs.h + +else + +$as_echo "#define WITH_OPENVSWITCH 0" >>confdefs.h + +fi + if test "${enable_ovs}" = "yes"; then + WITH_OPENVSWITCH_TRUE= + WITH_OPENVSWITCH_FALSE='#' +else + WITH_OPENVSWITCH_TRUE='#' + WITH_OPENVSWITCH_FALSE= +fi + + # DHCP client support # Check whether --with-dhclient was given. @@ -25459,6 +25708,7 @@ fi if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no; then config_dhcp_default='' fi +test -z "$config_dhcp_default" -a "$with_dhcpcanon" != "no" && config_dhcp_default='dhcpcanon' test -z "$config_dhcp_default" -a "$with_dhclient" != "no" && config_dhcp_default='dhclient' test -z "$config_dhcp_default" -a "$with_dhcpcd" != "no" && config_dhcp_default='dhcpcd' test -z "$config_dhcp_default" && config_dhcp_default='internal' @@ -25670,7 +25920,7 @@ if test "${with_iptables+set}" = set; then : fi if test "x${with_iptables}" = x; then - # Extract the first word of "iptables", so it can be a program name with args. + # Extract the first word of "iptables", so it can be a program name with args. set dummy iptables; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -25711,11 +25961,11 @@ $as_echo "no" >&6; } fi - if ! test -x "$IPTABLES_PATH"; then - as_fn_error $? "iptables was not installed." "$LINENO" 5 - fi + if ! test -x "$IPTABLES_PATH"; then + as_fn_error $? "iptables was not installed." "$LINENO" 5 + fi else - IPTABLES_PATH="$with_iptables" + IPTABLES_PATH="$with_iptables" fi cat >>confdefs.h <<_ACEOF @@ -25732,7 +25982,7 @@ if test "${with_dnsmasq+set}" = set; then : fi if test "x${with_dnsmasq}" = x; then - # Extract the first word of "dnsmasq", so it can be a program name with args. + # Extract the first word of "dnsmasq", so it can be a program name with args. set dummy dnsmasq; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -25774,7 +26024,7 @@ fi else - DNSMASQ_PATH="$with_dnsmasq" + DNSMASQ_PATH="$with_dnsmasq" fi cat >>confdefs.h <<_ACEOF @@ -25791,7 +26041,7 @@ if test "${with_dnssec_trigger+set}" = set; then : fi if test "x${with_dnssec_trigger}" = x; then - # Extract the first word of "dnssec-trigger-script", so it can be a program name with args. + # Extract the first word of "dnssec-trigger-script", so it can be a program name with args. set dummy dnssec-trigger-script; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -25834,7 +26084,7 @@ fi else - DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger" + DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger" fi cat >>confdefs.h <<_ACEOF @@ -25851,9 +26101,9 @@ if test "${with_system_ca_path+set}" = set; then : fi if test "x${with_system_ca_path}" = x; then - SYSTEM_CA_PATH=/etc/ssl/certs + SYSTEM_CA_PATH=/etc/ssl/certs else - SYSTEM_CA_PATH="$with_system_ca_path" + SYSTEM_CA_PATH="$with_system_ca_path" fi cat >>confdefs.h <<_ACEOF @@ -25868,11 +26118,10 @@ if test "${with_kernel_firmware_dir+set}" = set; then : withval=$with_kernel_firmware_dir; fi - if test -n "$with_kernel_firmware_dir" ; then - KERNEL_FIRMWARE_DIR="$with_kernel_firmware_dir" + KERNEL_FIRMWARE_DIR="$with_kernel_firmware_dir" else - KERNEL_FIRMWARE_DIR="/lib/firmware" + KERNEL_FIRMWARE_DIR="/lib/firmware" fi cat >>confdefs.h <<_ACEOF @@ -25982,6 +26231,7 @@ else fi + # Check whether --enable-concheck was given. if test "${enable_concheck+set}" = set; then : enableval=$enable_concheck; enable_concheck=${enableval} @@ -26350,9 +26600,9 @@ $as_echo "$ax_cv_lib_readline_echo_signal_char" >&6; } READLINE_LIBS="$ax_cv_lib_readline" - build_nmcli=yes + build_nmcli=yes else - build_nmcli=no + build_nmcli=no fi if test "$build_nmcli" = yes; then BUILD_NMCLI_TRUE= @@ -26442,10 +26692,10 @@ $as_echo "yes" >&6; } build_nmtui=yes fi else - build_nmtui=no + build_nmtui=no fi if test "$with_nmtui" = yes -a "$build_nmtui" = no; then - as_fn_error $? "You must have libnewt installed to build nmtui." "$LINENO" 5 + as_fn_error $? "You must have libnewt installed to build nmtui." "$LINENO" 5 fi if test "$build_nmtui" = yes; then BUILD_NMTUI_TRUE= @@ -26457,15 +26707,15 @@ fi if test $(( ${NM_MINOR_VERSION} % 2 )) = "1"; then - # A development version - more_warnings_default=error - more_asserts_default=100 - more_logging_default=yes + # 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 + # A release version + more_warnings_default=yes + more_asserts_default=0 + more_logging_default=no fi # Check whether --enable-more-warnings was given. @@ -26946,7 +27196,7 @@ if test "${enable_more_asserts+set}" = set; then : fi if test "${enable_more_asserts}" = "yes"; then - more_asserts=100 + more_asserts=100 fi # Check whether --with-more-asserts was given. @@ -26955,14 +27205,14 @@ if test "${with_more_asserts+set}" = set; then : fi if test "${more_asserts}" = "no"; then - more_asserts=0 + more_asserts=0 else - if test "${more_asserts}" = "yes"; then - more_asserts=100 - fi + if test "${more_asserts}" = "yes"; then + more_asserts=100 + fi fi if test "${more_asserts}" = ""; then - more_asserts=${more_asserts_default} + more_asserts=${more_asserts_default} fi cat >>confdefs.h <<_ACEOF @@ -26976,7 +27226,7 @@ if test "${enable_more_logging+set}" = set; then : fi if test "${enable_more_logging}" = ""; then - enable_more_logging=${more_logging_default} + enable_more_logging=${more_logging_default} fi if test "${enable_more_logging}" = "yes"; then @@ -27539,105 +27789,6 @@ fi NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto' -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. -set dummy ${ac_tool_prefix}nm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_BINUTILS_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $BINUTILS_NM in - [\\/]* | ?:[\\/]*) - ac_cv_path_BINUTILS_NM="$BINUTILS_NM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_BINUTILS_NM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -BINUTILS_NM=$ac_cv_path_BINUTILS_NM -if test -n "$BINUTILS_NM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BINUTILS_NM" >&5 -$as_echo "$BINUTILS_NM" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_BINUTILS_NM"; then - ac_pt_BINUTILS_NM=$BINUTILS_NM - # Extract the first word of "nm", so it can be a program name with args. -set dummy nm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_BINUTILS_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_BINUTILS_NM in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_BINUTILS_NM="$ac_pt_BINUTILS_NM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_BINUTILS_NM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_BINUTILS_NM=$ac_cv_path_ac_pt_BINUTILS_NM -if test -n "$ac_pt_BINUTILS_NM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_BINUTILS_NM" >&5 -$as_echo "$ac_pt_BINUTILS_NM" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_BINUTILS_NM" = x; then - BINUTILS_NM="nm" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - BINUTILS_NM=$ac_pt_BINUTILS_NM - fi -else - BINUTILS_NM="$ac_cv_path_BINUTILS_NM" -fi - - @@ -28227,12 +28378,12 @@ fi # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then - # If g-i is installed we know we have python, but we might not have pygobject - if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then - as_fn_error $? "\"--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)" "$LINENO" 5 - fi + # If g-i is installed we know we have python, but we might not have pygobject + if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then + as_fn_error $? "\"--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)" "$LINENO" 5 + fi - # Extract the first word of "perl", so it can be a program name with args. + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -28272,10 +28423,10 @@ $as_echo "no" >&6; } fi - if test -z "$PERL"; then - as_fn_error $? "--enable-introspection requires perl" "$LINENO" 5 - fi - # Extract the first word of "xsltproc", so it can be a program name with args. + if test -z "$PERL"; then + as_fn_error $? "--enable-introspection requires perl" "$LINENO" 5 + fi + # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -28315,43 +28466,44 @@ $as_echo "no" >&6; } fi - if test -z "$XSLTPROC"; then - as_fn_error $? "--enable-introspection requires xsltproc" "$LINENO" 5 - fi + if test -z "$XSLTPROC"; then + as_fn_error $? "--enable-introspection requires xsltproc" "$LINENO" 5 + fi - have_introspection=yes - if test "$enable_gtk_doc" = "yes"; then - build_docs=yes - fi + have_introspection=yes + if test "$enable_gtk_doc" = "yes"; then + build_docs=yes + fi else - if test "$enable_gtk_doc" = "yes"; then - # large parts of the documentation require introspection/pygobject to extract - # the documentation out of the source files. You cannot enable gtk-doc without alone. - as_fn_error $? "\"--with-gtk-doc requires --enable-introspection\"" "$LINENO" 5 - fi - have_introspection=no + if test "$enable_gtk_doc" = "yes"; then + # large parts of the documentation require introspection/pygobject to extract + # the documentation out of the source files. You cannot enable gtk-doc without alone. + as_fn_error $? "\"--with-gtk-doc requires --enable-introspection\"" "$LINENO" 5 + fi + have_introspection=no fi # check for pregenerated manpages and documentation to be installed use_pregen_docs=no -if test "$build_docs" != "yes" \ - -a -f man/NetworkManager.8 \ - -a -f man/NetworkManager.conf.5 \ - -a -f man/nm-online.1 \ - -a -f man/nmcli-examples.7 \ - -a -f man/nmcli.1 \ - -a -f man/nmtui.1 \ - \ - -a -f man/nm-settings-ifcfg-rh.5 \ - -a -f man/nm-settings-keyfile.5 \ - -a -f man/nm-settings.5 \ - \ - -a -f man/nm-settings.xml \ - -a -f man/nm-settings-keyfile.xml \ - -a -f man/nm-settings-ifcfg-rh.xml \ - \ - -a -f docs/api/settings-spec.xml \ - ; then +if test "$build_docs" != "yes" -a \ + -f "$srcdir"/man/NetworkManager.8 -a \ + -f "$srcdir"/man/NetworkManager.conf.5 -a \ + -f "$srcdir"/man/nm-online.1 -a \ + -f "$srcdir"/man/nmcli-examples.7 -a \ + -f "$srcdir"/man/nmcli.1 -a \ + -f "$srcdir"/man/nmtui.1 -a \ + \ + -f "$srcdir"/man/nm-openvswitch.7 -a \ + \ + -f "$srcdir"/man/nm-settings-ifcfg-rh.5 -a \ + -f "$srcdir"/man/nm-settings-keyfile.5 -a \ + -f "$srcdir"/man/nm-settings.5 -a \ + \ + -f "$srcdir"/man/nm-settings.xml -a \ + -f "$srcdir"/man/nm-settings-keyfile.xml -a \ + -f "$srcdir"/man/nm-settings-ifcfg-rh.xml -a \ + \ + -f "$srcdir"/docs/api/settings-spec.xml; then use_pregen_docs=yes fi @@ -28612,6 +28764,10 @@ if test -z "${WITH_OFONO_TRUE}" && test -z "${WITH_OFONO_FALSE}"; then as_fn_error $? "conditional \"WITH_OFONO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_OPENVSWITCH_TRUE}" && test -z "${WITH_OPENVSWITCH_FALSE}"; then + as_fn_error $? "conditional \"WITH_OPENVSWITCH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_LIBPSL_TRUE}" && test -z "${WITH_LIBPSL_FALSE}"; then as_fn_error $? "conditional \"WITH_LIBPSL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -29069,7 +29225,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.8.4, which was +This file was extended by NetworkManager $as_me 1.9.90, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29135,7 +29291,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.8.4 +NetworkManager config.status 1.9.90 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -31287,6 +31443,7 @@ echo " modemmanager-1: $with_modem_manager_1" echo " ofono: $with_ofono" echo " concheck: $enable_concheck" echo " libteamdctl: $enable_teamdctl" +echo " ovs: $enable_ovs" echo " libnm-glib: $with_libnm_glib" echo " nmcli: $build_nmcli" echo " nmtui: $build_nmtui" @@ -31306,6 +31463,7 @@ echo " config-dns-rc-manager-default: ${config_dns_rc_manager_default}" echo echo "DHCP clients (default $config_dhcp_default):" +echo " dhcpcanon: $with_dhcpcanon" echo " dhclient: $with_dhclient" echo " dhcpcd: $with_dhcpcd" echo " dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6" |